Changeset 139 for cpp/frams/genetics/defgenoconv.cpp

Timestamp:

02/20/14 17:49:28 (11 years ago)

Author:

sz

Message:

class renaming + minor corrections

File:

• cpp/frams/genetics/defgenoconv.cpp (modified) (1 diff)

cpp/frams/genetics/defgenoconv.cpp ¶

@@ -7 +7 @@
 #include GEN_CONFIG_FILE
 
-#ifdef USE_GENCONV_F10
+#ifdef USE_GENCONV_f10
 #include "f1/conv_f1.h"
 #endif
-#ifdef USE_GENCONV_F20
+#ifdef USE_GENCONV_f20
 #include "f2/conv_f2.h"
 #endif
-#ifdef USE_GENCONV_F32
+#ifdef USE_GENCONV_f32
 #include "f3/conv_f3.h"
 #endif
-#ifdef USE_GENCONV_F40
+#ifdef USE_GENCONV_f40
 #include "f4/conv_f4.h"
 #endif
-#ifdef USE_GENCONV_F41_TEST
+#ifdef USE_GENCONV_f41_TEST
 #include "f4/conv_f4.h"
 #endif
-#ifdef USE_GENCONV_F50
+#ifdef USE_GENCONV_f50
 #include "f5/conv_f5.h"
 #endif
-#ifdef USE_GENCONV_F60
+#ifdef USE_GENCONV_f60
 #include "f6/geno_f6.h"
 #endif
-#ifdef USE_GENCONV_F70
+#ifdef USE_GENCONV_f70
 #include "f7/conv_f7.h"
 #endif
-#ifdef USE_GENCONV_F81
+#ifdef USE_GENCONV_f81
 #include "f8/conv_f8tof1.h"
 #endif
-#ifdef USE_GENCONV_F90
+#ifdef USE_GENCONV_f90
 #include "f9/conv_f9.h"
+#endif
+#ifdef USE_GENCONV_fF0
+#include "fF/conv_fF.h"
 #endif
 
 DefaultGenoConvManager::DefaultGenoConvManager()
 {
-#ifdef USE_GENCONV_F10
-addConverter(new GenoConv_F1());
+#ifdef USE_GENCONV_f10
+        addConverter(new GenoConv_f1());
 #endif
-#ifdef USE_GENCONV_F20
-addConverter(new GenoConv_F20());
+#ifdef USE_GENCONV_f20
+        addConverter(new GenoConv_f20());
 #endif
-#ifdef USE_GENCONV_F32
-addConverter(new GenoConv_F32());
+#ifdef USE_GENCONV_f32
+        addConverter(new GenoConv_f32());
 #endif
-#ifdef USE_GENCONV_F40
-addConverter(new GenoConv_F40());
+#ifdef USE_GENCONV_f40
+        addConverter(new GenoConv_f40());
 #endif
-#ifdef USE_GENCONV_F41_TEST
-addConverter(new GenoConv_F41_TestOnly());
+#ifdef USE_GENCONV_f41_TEST
+        addConverter(new GenoConv_f41_TestOnly());
 #endif
-#ifdef USE_GENCONV_F50
-addConverter(new GenoConv_F50);
+#ifdef USE_GENCONV_f50
+        addConverter(new GenoConv_f50);
 #endif
-#ifdef USE_GENCONV_F60
-addConverter(new GenoConv_F60);
+#ifdef USE_GENCONV_f60
+        addConverter(new GenoConv_f60);
 #endif
-#ifdef USE_GENCONV_F70
-addConverter(new GenoConv_F70);
+#ifdef USE_GENCONV_f70
+        addConverter(new GenoConv_f70);
 #endif
-#ifdef USE_GENCONV_F81
-addConverter(new GenoConv_F8ToF1());
+#ifdef USE_GENCONV_f81
+        addConverter(new GenoConv_f8ToF1());
 #endif
-#ifdef USE_GENCONV_F90
-addConverter(new GenoConv_F90);
+#ifdef USE_GENCONV_f90
+        addConverter(new GenoConv_f90);
+#endif
+#ifdef USE_GENCONV_fF0
+        addConverter(new GenoConv_fF0);
 #endif
 
-param.updatetab();
+        param.updatetab();
 }