Changeset 748 for cpp/frams

Timestamp:

02/28/18 19:41:33 (7 years ago)

Author:

Maciej Komosinski

Message:

Configured and activated the new "fn" genetic representation

Location:

cpp/frams

Files:

• Makefile-SDK-files (modified) (2 diffs)
• genetics/defgenoconv.cpp (modified) (2 diffs)
• genetics/gen-config-SDK.h (modified) (2 diffs)
• genetics/genman.cpp (modified) (2 diffs)

cpp/frams/Makefile-SDK-files

@@ -8 +8 @@
 GENMANFF=frams/genetics/fF/oper_fF.o
 GENMANFT=frams/genetics/fT/oper_fTest.o
+GENMANFN=frams/genetics/fn/oper_fn.o
 
 CONVF1=frams/genetics/f1/conv_f1.o
@@ -13 +14 @@
 CONVF9=frams/genetics/f9/conv_f9.o
 CONVFF=frams/genetics/fF/conv_fF.o frams/genetics/fF/fF_genotype.o frams/genetics/fF/fF_chamber3d.o
+CONVFN=frams/genetics/fn/conv_fn.o
 
-GENOCONV_SDK_OBJS=frams/genetics/defgenoconv.o frams/vm/classes/genoobj.o frams/model/autoname.o $(CONVF1) $(CONVF4) $(CONVF9) $(CONVFF)
-GENMAN_SDK_OBJS=$(GENMAN_COMMON_OBJS) $(GENMANF4) $(GENMANF9) $(GENMANFF) $(GENMANFT)
+GENOCONV_SDK_OBJS=frams/genetics/defgenoconv.o frams/vm/classes/genoobj.o frams/model/autoname.o $(CONVF1) $(CONVF4) $(CONVF9) $(CONVFF) $(CONVFN)
+GENMAN_SDK_OBJS=$(GENMAN_COMMON_OBJS) $(GENMANF4) $(GENMANF9) $(GENMANFF) $(GENMANFT) $(GENMANFN)
 
 GENMAN_COMMON_OBJS=frams/genetics/genman.o frams/param/mutableparam.o frams/param/mutparamlist.o frams/neuro/geneticneuroparam.o frams/neuro/neurolibparam.o

cpp/frams/genetics/defgenoconv.cpp

@@ -40 +40 @@
 #include "fF/conv_fF.h"
 #endif
+#ifdef USE_GENCONV_fn0
+#include "fn/conv_fn.h"
+#endif
 
 void DefaultGenoConvManager::addDefaultConverters()
@@ -76 +79 @@
         addConverter(new GenoConv_fF0);
 #endif
+#ifdef USE_GENCONV_fn0
+        addConverter(new GenoConv_fn0);
+#endif
 
         param.updatetab();

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

@@ -20 +20 @@
 #define USE_GENCONV_f90
 #define USE_GENCONV_fF0
+#define USE_GENCONV_fn0
 
 //#define USE_GENMAN_f0
@@ -30 +31 @@
 #define USE_GENMAN_fF
 #define USE_GENMAN_fT
-
+#define USE_GENMAN_fn

cpp/frams/genetics/genman.cpp

@@ -47 +47 @@
 #ifdef USE_GENMAN_fF
 #include "fF/oper_fF.h"
+#endif
+#ifdef USE_GENMAN_fn
+#include "fn/oper_fn.h"
 #endif
 #ifdef USE_GENMAN_fT
@@ -143 +146 @@
 #ifdef USE_GENMAN_fF
         oper_fx_list.push_back(new GenoOper_fF);
+#endif
+#ifdef USE_GENMAN_fn
+        oper_fx_list.push_back(new GenoOper_fn);
 #endif
 #ifdef USE_GENMAN_fT