Changeset 774 for cpp/frams/genetics/f4/conv_f4.h
- Timestamp:
- 04/11/18 01:16:08 (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
cpp/frams/genetics/f4/conv_f4.h
r760 r774 32 32 * @return generated f0 genotype 33 33 */ 34 SString convert(SString &in, MultiMap * 34 SString convert(SString &in, MultiMap *map, bool using_checkpoints); 35 35 }; 36 36 … … 57 57 * @return generated approximate f1 genotype 58 58 */ 59 SString convert(SString &in, MultiMap * 59 SString convert(SString &in, MultiMap *map, bool using_checkpoints); 60 60 }; 61 61 … … 82 82 void toF1Geno(SString &out); // output to f1 format, approximation 83 83 private: 84 f4_Cells * 85 int buildModelRec(f4_Cell * 84 f4_Cells *cells; 85 int buildModelRec(f4_Cell *ndad); 86 86 /** 87 87 * Get a cell which is a stick, by traversing dadlinks. 88 88 */ 89 f4_Cell * getStick(f4_Cell *C);89 f4_Cell* getStick(f4_Cell *C); 90 90 int error; 91 91 int errorpos;
Note: See TracChangeset
for help on using the changeset viewer.