Changeset 33 for cpp/f8-to-f1/geno_f8.cpp

Timestamp:

10/31/09 00:47:01 (14 years ago)

Author:

Maciej Komosinski

Message:

maximal f1 genotype length published as the f8->f1 converter parameter

File:

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

cpp/f8-to-f1/geno_f8.cpp

@@ -32 +32 @@
 {"f8_mut_chg_cond_sign", 0, 0, "Change condition sign", "f 0 100 7",FIELD(operation[F8_CHANGE_CONDITION_SIGN]),"mutation: probability of changing a condition sign", },
 {"f8_mut_add_param", 0, 0, "Add parameter", "f 0 100 8", FIELD(operation[F8_ADD_PARAMETER]),"mutation: probability of adding a parameter to the production", },
-{"f8_mut_add_cond", 0, 0, "Add condition", "f 0 100 8", FIELD(operation[F8_ADD_CONDITION]),"mutation: probability of ading a condition to the subproduction", },
+{"f8_mut_add_cond", 0, 0, "Add condition", "f 0 100 8", FIELD(operation[F8_ADD_CONDITION]),"mutation: probability of adding a condition to the subproduction", },
 {"f8_mut_add_subprod", 0, 0, "Add subproduction", "f 0 100 8", FIELD(operation[F8_ADD_SUBPRODUCTION]),"mutation: probability of adding a subproduction", },
-{"f8_mut_chg_iter_number", 0, 0, "Change iteration number", "f 0 100 7", FIELD(operation[F8_CHANGE_ITERATIONS_NUMBER]),"mutation: probability of changing an iterations number", },
+{"f8_mut_chg_iter_number", 0, 0, "Change iteration number", "f 0 100 7", FIELD(operation[F8_CHANGE_ITERATIONS_NUMBER]),"mutation: probability of changing a number of iterations", },
 {"f8_mut_del_param", 0, 0, "Delete parameter", "f 0 100 8", FIELD(operation[F8_DELETE_PARAMETER]),"mutation: probability of deleting a parameter", },
 {"f8_mut_del_cond", 0, 0, "Delete condition", "f 0 100 8", FIELD(operation[F8_DELETE_CONDITION]),"mutation: probability of deleting a condition", },
-{"f8_mut_add_loop", 0, 0, "Add loop", "f 0 100 0", FIELD(operation[F8_ADD_LOOP]),"mutation: probability of ading a loop", },
+{"f8_mut_add_loop", 0, 0, "Add loop", "f 0 100 0", FIELD(operation[F8_ADD_LOOP]),"mutation: probability of adding a loop", },
 {"f8_mut_del_loop", 0, 0, "Delete loop", "f 0 100 0", FIELD(operation[F8_DELETE_LOOP]),"mutation: probability of deleting a loop", },
 {"f8_mut_del_prod", 0, 0, "Delete production", "f 0 100 8", FIELD(operation[F8_DELETE_PRODUCTION]),"mutation: probability of deleting a production", },
@@ -63 +63 @@
         this->simpleCommandLetters.push_back('^');
         this->converter = new GenoConv_F8ToF1();
-        
+
         par.setParamTab(GENO8param_tab);
         par.select(this);
         par.setDefault();
-        
-        /*mutation_method_names = new char*[F8_OPERATION_COUNT - 1];
+
+        /*mutation_method_names = new char*[F8_OPERATION_COUNT - 1]; //FIXME
         int index = 0;
         mutation_method_names[index++]="changed beginning argument";
@@ -511 +511 @@
                                 newActions.push_back(subproduction->actions[i]);
                         }
-                        for (i = firstActionIdx; i <= firstActionIdx + randomN(4) + 1 
+                        for (i = firstActionIdx; i <= firstActionIdx + randomN(4) + 1
                                  && i < subproduction->actions.size(); i++) { //1..4 actions
                                 newSubProd->actions.push_back(subproduction->actions[i]);
@@ -551 +551 @@
         
         delete lsystem;
-        
+
         chg = (float) len / (float) in.len();
         return mutated;
@@ -569 +569 @@
                 mutated += in;
                 chg = 0.0;
+                delete lsystem;
                 return mutated;
         }
-        
-        int counter = 0;
+
         vector<SString> productionNamesSS = this->converter->readProductionNames(in);
         vector<string> productionNames;
@@ -601 +601 @@
         //choose production to which we will append the contents of deleted production
         string prodNameToAppendTo = productionNames[randomN(productionNames.size())];
-        
+
         int len = 0;
-        
+
         Production* deletedProd = lsystem->productions[prodNameToDelete];
         Production* appendProd = lsystem->productions[prodNameToAppendTo];
@@ -613 +613 @@
                 }
         }
-        
+
         //copy subproductions
         for (vector<SubProduction>::iterator subprodIter = deletedProd->subproductions.begin();
@@ -639 +639 @@
         }
         lsystem->productions.erase(string(prodNameToDelete));
-        
+
         int paramCount = appendProd->parameters.size();
         for (map<string, Production*>::iterator prodIter = lsystem->productions.begin();
@@ -647 +647 @@
                         for (vector<ActionStrP>::iterator actionIter = (*subprodIter).actions.begin();
                                  actionIter != (*subprodIter).actions.end(); actionIter++) {
-                                if ((*actionIter).action != NULL && (*actionIter).action->name != NULL) { 
+                                if ((*actionIter).action != NULL && (*actionIter).action->name != NULL) {
                                         if ((*actionIter).action->name == stringToSString(prodNameToDelete)) {
                                                 (*actionIter).action = appendProd;
@@ -659 +659 @@
                                                 }
                                         }
-                                        
+
                                 }
                         }
@@ -665 +665 @@
         }
         delete deletedProd;
-                
-        
+
+
         mutated = lsystem->toString();
-        
+
         delete lsystem;
-        
+
         chg = (float) len / (float) in.len();
         return mutated;
@@ -677 +677 @@
 SString Geno_f8::mutateChangeConditionSign(SString &in, float& chg) {
         SString mutated;
-        
+
         Lsystem *newLsystem = this->converter->createLsystem(in);
         if (newLsystem == NULL) {
@@ -684 +684 @@
                 return mutated;
         }
-        
+
         map<int, SubProduction*> interestingSubproductions;
         int counter = 0;
-        
+
         for (map<string, Production*>::iterator prodIter = newLsystem->productions.begin();
                  prodIter != newLsystem->productions.end(); prodIter++) {
@@ -698 +698 @@
                 }
         }
-        
+
         if (interestingSubproductions.size() > 0) {
                 int random1 = randomN(interestingSubproductions.size());
@@ -707 +707 @@
                 chg = 2.0 / (float) in.len();
         }
-        
+
         mutated = newLsystem->toString();
-        
+
         delete newLsystem;
-        
+
         return mutated;
 }
@@ -717 +717 @@
 SString Geno_f8::mutateAddParameter(SString &in, float& chg) {
         SString mutated;
-        
+
         Lsystem *lsystem = this->converter->createLsystem(in);
         if (lsystem == NULL || lsystem->productions.size() == 0) {
@@ -724 +724 @@
                 return mutated;
         }
-        
+
         //cout << "addParameter 1" << endl;
         int rnd = randomN(lsystem->productions.size());
         int chglen = 0;
-        
+
         SString prodName = "";
-        
+
         int counter = 0;
         for (map<string, Production*>::iterator prodIter = lsystem->productions.begin();
@@ -746 +746 @@
                                 }
                         }
-                        
+
                         if (prodName == stringToSString(lsystem->firstProductionName)) {
                                 lsystem->startParams[sstringToString(newParam)] = 0.0;
@@ -1083 +1083 @@
         (method == 13) ? "F8_ADD_LOOP" :
         (method == 14) ? "F8_DELETE_LOOP" :
-        (method == 15) ? "F8_OPERATION_COUNT" : "babol";
+        (method == 15) ? "F8_OPERATION_COUNT" : "*invalid*";
         //cout << "-------------------- " << mutationName << " --------------------" << endl;
 #endif