Changeset 40 for cpp/f8-to-f1/geno_f8.cpp
- Timestamp:
- 12/02/09 22:39:16 (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
cpp/f8-to-f1/geno_f8.cpp
r35 r40 94 94 95 95 char* Geno_f8::getSimplest() { 96 const char* geno = "1\n---\nP0\nP0():X\n"; 97 char* retGeno = (char*)malloc(strlen(geno) + 1); 98 strcpy(retGeno, geno); 99 return retGeno; 96 return "1\n---\nP0\nP0():X\n"; 100 97 } 101 98 … … 105 102 const char* f1genosrc = f1ssgeno; 106 103 Geno f1geno(f1genosrc); 107 if ( this->converter->checkSyntax(geno) &&f1geno.isValid()) {104 if (/*this->converter->checkSyntax(geno) &&*/ f1geno.isValid()) { 108 105 return GENOPER_OK; 109 106 } else { … … 1071 1068 int Geno_f8::mutate(char *&g,float& chg, int &method) { 1072 1069 SString in = g; 1073 1070 1074 1071 /*struct timeval tv; 1075 1072 gettimeofday(&tv, NULL); … … 1080 1077 return GENOPER_OPFAIL; 1081 1078 } 1082 1079 1083 1080 #if GENO_F8_DEBUG > 0 1084 1081 string mutationName = (method == 0) ? "F8_CHANGE_BEGINNING_ARG" : //TODO use mutation_method_names[] here … … 1100 1097 //cout << "-------------------- " << mutationName << " --------------------" << endl; 1101 1098 #endif 1102 1099 1103 1100 const char* mutatedTmp; 1104 1101 SString ssMutatedTmp; 1105 1102 1106 1103 //cout << "mutate 1" << endl; 1107 1104 switch (method) { … … 1157 1154 return GENOPER_OPFAIL; 1158 1155 } 1159 1156 1160 1157 //cout << "mutate 2" << endl; 1161 1158 if (ssMutatedTmp.len() < 16) {
Note: See TracChangeset
for help on using the changeset viewer.