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

Timestamp:

05/22/09 21:56:05 (16 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/geno_f8.cpp (modified) (1 diff)

cpp/f8-to-f1/geno_f8.cpp

@@ -1199 +1199 @@
 
 RelationType Geno_f8::getDifferentCondition(RelationType type) {
-        RelationType types[5];
+        RelationType types[6];
+        types[0] = r_greater;
+        types[1] = r_greaterEqual;
+        types[2] = r_equal;
+        types[3] = r_different;
+        types[4] = r_lessEqual;
+        types[5] = r_less;
+        
+        for (int i = 0; i < 6; i++) {
+                if (types[i] == type) {
+                        types[i] = types[5];
+                        types[5] = type;
+                        break;
+                }
+        }
+        
         int randomType = randomN(5);
-        if (type == r_greater) {
-                types[0] = r_greaterEqual;
-                types[1] = r_equal;
-                types[2] = r_different;
-                types[3] = r_lessEqual;
-                types[4] = r_less;
-        } else if (type == r_greaterEqual) {
-                types[0] = r_greater;
-                types[1] = r_equal;
-                types[2] = r_different;
-                types[3] = r_lessEqual;
-                types[4] = r_less;
-        } else if (type == r_equal) {
-                types[0] = r_greater;
-                types[1] = r_greaterEqual;
-                types[2] = r_different;
-                types[3] = r_lessEqual;
-                types[4] = r_less;
-        } else if (type == r_different) {
-                types[0] = r_greater;
-                types[1] = r_greaterEqual;
-                types[2] = r_equal;
-                types[3] = r_lessEqual;
-                types[4] = r_less;
-        } else if (type == r_lessEqual) {
-                types[0] = r_greater;
-                types[1] = r_greaterEqual;
-                types[2] = r_equal;
-                types[3] = r_different;
-                types[4] = r_less;
-        } else if (type == r_less) {
-                types[0] = r_greater;
-                types[1] = r_greaterEqual;
-                types[2] = r_equal;
-                types[3] = r_different;
-                types[4] = r_lessEqual;
-        }
         return types[randomType];
 }