Changeset 25

Timestamp:

06/29/09 21:02:03 (16 years ago)

Author:

mwajcht

Message:

Added parameter which indicated the maximum length of F1 genotype converter can produce. Default value is 500, but it can be overriden in converter's constructor.

Location:

cpp/f8-to-f1

Files:

• conv_f8tof1.cpp (modified) (1 diff)
• conv_f8tof1.h (modified) (2 diffs)

cpp/f8-to-f1/conv_f8tof1.cpp

@@ -653 +653 @@
                 if (a != NULL) {
                         dst += a->getF1Genotype(p);
-                        if (dst.len() > 1500) {
-                                return ""; //genotype becomes too long so we abort conversion
+                        if (dst.len() > maxF1Length) {
+                                return SString(); //genotype becomes too long so we abort conversion
                         }
                 }

cpp/f8-to-f1/conv_f8tof1.h

@@ -166 +166 @@
                 mapsupport = 0;
                 info = "ble";
+                maxF1Length = 500;
+        }
+        
+        GenoConv_F8ToF1(int f1LengthLimit) {
+                name = "f8 to f1 converter";
+                in_format = '8';
+                out_format = '1';
+                mapsupport = 0;
+                info = "ble";
+                maxF1Length = f1LengthLimit;
         }
         
@@ -177 +187 @@
 protected:
         bool parseInput(const char* src, Lsystem* lsys);
+        int maxF1Length;
 };