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

Timestamp:

10/31/09 14:44:45 (14 years ago)

Author:

Maciej Komosinski

Message:

simple productions are now more complete, and stored once, in a constant variable

File:

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

cpp/f8-to-f1/geno_f8.cpp

@@ -50 +50 @@
 }
 
-Geno_f8::Geno_f8() {
+Geno_f8::Geno_f8()
+{
         supported_format = '8';
-        this->simpleCommandLetters.push_back('X');
-        this->simpleCommandLetters.push_back('R');
-        this->simpleCommandLetters.push_back('r');
-        this->simpleCommandLetters.push_back('C');
-        this->simpleCommandLetters.push_back('c');
-        this->simpleCommandLetters.push_back('Q');
-        this->simpleCommandLetters.push_back('q');
-        this->simpleCommandLetters.push_back('[');
-        this->simpleCommandLetters.push_back(']');
-        this->simpleCommandLetters.push_back('^');
+
+        for(int i=0;i<strlen(GenoConv_F8ToF1::simpleprods);i++)
+                this->simpleCommandLetters.push_back(GenoConv_F8ToF1::simpleprods[i]);
+                
         this->converter = new GenoConv_F8ToF1();
 
@@ -301 +296 @@
 SString Geno_f8::mutateChangeArg(SString &in, float& chg) {
         SString mutated;
-        
+
         Lsystem *newLsystem = this->converter->createLsystem(in);
         if (newLsystem == NULL) {
@@ -1087 +1082 @@
         
 #if GENO_F8_DEBUG > 0
-        string mutationName = (method == 0) ? "F8_CHANGE_BEGINNING_ARG" :
+        string mutationName = (method == 0) ? "F8_CHANGE_BEGINNING_ARG" : //TODO use mutation_method_names[] here
         (method == 1) ? "F8_CHANGE_ARG" :
         (method == 2) ? "F8_DELETE_COMMAND" :