Changeset 33 for cpp/f8-to-f1/conv_f8tof1.h

Timestamp:

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

Author:

Maciej Komosinski

Message:

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

File:

• cpp/f8-to-f1/conv_f8tof1.h (modified) (1 diff)

cpp/f8-to-f1/conv_f8tof1.h

@@ -217 +217 @@
         map<string, PrimitiveProduction*> primitiveProductions;
         map<string, ParamProduction*> paramProductions;
-        
+
         void removeEmptySubproductionsAndProductions();
 };
+
+
+
+
 
 /// Converter between f8 and f1 format
 class GenoConv_F8ToF1 : public GenoConverter {
 public:
-        /// Default constructor
-        GenoConv_F8ToF1() {
-                name = "f8 to f1 converter";
-                in_format = '8';
-                out_format = '1';
-                mapsupport = 0;
-                info = "ble";
-                maxF1Length = 500;
-        }
-        
-        /// Constructor with parameter
-        /// @param f1LengthLimit If resulting f1 genotype is longer than f1LengthLimit, converter aborts its job
-        GenoConv_F8ToF1(int f1LengthLimit) {
-                name = "f8 to f1 converter";
-                in_format = '8';
-                out_format = '1';
-                mapsupport = 0;
-                info = "ble";
-                maxF1Length = f1LengthLimit;
-        }
-        
+        Param par;
+
+        GenoConv_F8ToF1();
         ~GenoConv_F8ToF1() {}
-        
+
         SString convert(SString &in, MultiMap *map);
-        
+
         /// check syntax of given f8 genotype
         /// @param geno f8 genotype to be checked
         bool checkSyntax(const char *geno);
-        
+
         /// returns names of productions in a given genotype
         /// @param in f8 genotype
         vector<SString> readProductionNames(const SString &in);
         //Lsystem* createLsystem(const SString &in);
-        
+
         /// creates Lsystem object based on input genotype
         /// @param f8 genotype
         Lsystem* createLsystem(SString in);
+
+        int maxF1Length;
 protected:
         bool parseInput(const char* src, Lsystem* lsys);
-        int maxF1Length;
 };