Changeset 780 for cpp/frams/genetics

Timestamp:

05/14/18 17:53:10 (6 years ago)

Author:

Maciej Komosinski

Message:

Added sources for genetic encodings fB, fH, fL

Location:

cpp/frams/genetics

Files:

• defgenoconv.cpp (modified) (2 diffs)
• fB (added)
• fB/fB_conv.cpp (added)
• fB/fB_conv.h (added)
• fB/fB_general.h (added)
• fB/fB_oper.cpp (added)
• fB/fB_oper.h (added)
• fH (added)
• fH/fH_conv.cpp (added)
• fH/fH_conv.h (added)
• fH/fH_general.cpp (added)
• fH/fH_general.h (added)
• fH/fH_oper.cpp (added)
• fH/fH_oper.h (added)
• fL (added)
• fL/fL_conv.cpp (added)
• fL/fL_conv.h (added)
• fL/fL_general.cpp (added)
• fL/fL_general.h (added)
• fL/fL_matheval.cpp (added)
• fL/fL_matheval.h (added)
• fL/fL_oper.cpp (added)
• fL/fL_oper.h (added)
• gen-config-SDK.h (modified) (2 diffs)
• genman.cpp (modified) (2 diffs)

cpp/frams/genetics/defgenoconv.cpp

@@ -43 +43 @@
 #include "fn/fn_conv.h"
 #endif
+#ifdef USE_GENCONV_fBH
+#include "fB/fB_conv.h"
+#endif
+#ifdef USE_GENCONV_fH0
+#include "fH/fH_conv.h"
+#endif
+#ifdef USE_GENCONV_fL0
+#include "fL/fL_conv.h"
+#endif
 
 void DefaultGenoConvManager::addDefaultConverters()
@@ -82 +91 @@
         addConverter(new GenoConv_fn0);
 #endif
+#ifdef USE_GENCONV_fBH
+        addConverter(new GenoConv_fBH);
+#endif
+#ifdef USE_GENCONV_fH0
+        addConverter(new GenoConv_fH0);
+#endif
+#ifdef USE_GENCONV_fL0
+        addConverter(new GenoConv_fL0);
+#endif
 
         param.updatetab();

cpp/frams/genetics/gen-config-SDK.h

@@ -21 +21 @@
 #define USE_GENCONV_fF0
 #define USE_GENCONV_fn0
+#define USE_GENCONV_fBH
+#define USE_GENCONV_fH0
+#define USE_GENCONV_fL0
 
 //#define USE_GENMAN_f0
@@ -32 +35 @@
 #define USE_GENMAN_fT
 #define USE_GENMAN_fn
+#define USE_GENMAN_fB
+#define USE_GENMAN_fH
+#define USE_GENMAN_fL

cpp/frams/genetics/genman.cpp

@@ -59 +59 @@
 #ifdef USE_GENMAN_fT
 #include "fT/fTest_oper.h"
+#endif
+#ifdef USE_GENMAN_fB
+#include "fB/fB_oper.h"
+#endif
+#ifdef USE_GENMAN_fH
+#include "fH/fH_oper.h"
+#endif
+#ifdef USE_GENMAN_fL
+#include "fL/fL_oper.h"
 #endif
 
@@ -158 +167 @@
 #ifdef USE_GENMAN_fT
         oper_fx_list.push_back(new GenoOper_fTest);
+#endif
+#ifdef USE_GENMAN_fB
+        oper_fx_list.push_back(new Geno_fB);
+#endif
+#ifdef USE_GENMAN_fH
+        oper_fx_list.push_back(new Geno_fH);
+#endif
+#ifdef USE_GENMAN_fL
+        oper_fx_list.push_back(new Geno_fL);
 #endif