Changeset 40 for cpp/f8-to-f1

Timestamp:

12/02/09 22:39:16 (15 years ago)

Author:

Maciej Komosinski

Message:

fixed memory leak and commented out an extra condition

File:

• cpp/f8-to-f1/geno_f8.cpp (modified) (6 diffs)

cpp/f8-to-f1/geno_f8.cpp

@@ -94 +94 @@
 
 char* Geno_f8::getSimplest() {
-        const char* geno = "1\n---\nP0\nP0():X\n";
-        char* retGeno = (char*)malloc(strlen(geno) + 1);
-        strcpy(retGeno, geno);
-        return retGeno;
+        return "1\n---\nP0\nP0():X\n";
 }
 
@@ -105 +102 @@
         const char* f1genosrc = f1ssgeno;
         Geno f1geno(f1genosrc);
-        if (this->converter->checkSyntax(geno) && f1geno.isValid()) {
+        if (/*this->converter->checkSyntax(geno) &&*/ f1geno.isValid()) {
                 return GENOPER_OK;
         } else {
@@ -1071 +1068 @@
 int Geno_f8::mutate(char *&g,float& chg, int &method) {
         SString in = g;
-        
+
         /*struct timeval tv;
         gettimeofday(&tv, NULL);
@@ -1080 +1077 @@
                 return GENOPER_OPFAIL;
         }
-        
+
 #if GENO_F8_DEBUG > 0
         string mutationName = (method == 0) ? "F8_CHANGE_BEGINNING_ARG" : //TODO use mutation_method_names[] here
@@ -1100 +1097 @@
         //cout << "-------------------- " << mutationName << " --------------------" << endl;
 #endif
-        
+
         const char* mutatedTmp;
         SString ssMutatedTmp;
-        
+
         //cout << "mutate 1" << endl;
         switch (method) {
@@ -1157 +1154 @@
                         return GENOPER_OPFAIL;
         }
-        
+
         //cout << "mutate 2" << endl;
         if (ssMutatedTmp.len() < 16) {