Changeset 7 for cpp/f8-to-f1/conv_f8tof1.cpp

Timestamp:

05/22/09 21:56:05 (15 years ago)

Author:

mwajcht

Message:

1. Fixed bug in converter.
2. Genotypes with resulting F1 genotype longer than 1500 characters will not be converted.
3. Simplified choosing different condition.

File:

• cpp/f8-to-f1/conv_f8tof1.cpp (modified) (2 diffs)

cpp/f8-to-f1/conv_f8tof1.cpp

@@ -601 +601 @@
                 int position = firstProduction->parameters.getParameterPosition(stringToSString(iter->first));
                 //cout << "position of " << iter->first << ": " << position << endl;
-                //params.insert(params.begin() + (position - 1), iter->second);
-                params[position - 1] = iter->second;
+                params.insert(params.begin() + (position - 1), iter->second);
+                //params[position - 1] = iter->second;
         }
         
@@ -646 +646 @@
                 if (a != NULL) {
                         dst += a->getF1Genotype(p);
+                        if (dst.len() > 1500) {
+                                return ""; //genotype becomes too long so we abort conversion
+                        }
                 }
         }