Changeset 138

Timestamp:

02/19/14 13:59:17 (11 years ago)

Author:

sz

Message:

genetic operator example - frams/_demos/genooper_test.cpp

Location:

cpp/frams

Files:

• Makefile-GDK (modified) (2 diffs, 1 prop)
• Makefile-GDK-files (modified) (2 diffs, 1 prop)
• Makefile-maintain (modified) (1 prop)
• _demos/genooper_test.cpp (added)
• genetics/gen-config-GDK.h (modified) (1 diff)
• genetics/genman.cpp (added)
• genetics/genman.h (added)
• model/autoname.cpp (added)
• model/autoname.h (added)
• neuro/geneticneuroparam.cpp (added)
• neuro/geneticneuroparam.h (added)
• neuro/neurolibparam.cpp (added)
• neuro/neurolibparam.h (added)
• param/mutableparam.cpp (added)
• param/mutableparam.h (added)
• param/mutparamiface.h (added)
• param/mutparamlist.cpp (added)
• param/mutparamlist.h (added)
• vm/classes/genoobj.cpp (added)
• vm/classes/genoobj.h (added)

cpp/frams/Makefile-GDK

@@ -5 +5 @@
 include frams/Makefile-GDK-files
 
-GDK_TESTS=genoconv_test gdk_test geno_test neuro_test loader_test serial_test multiline_f0_test f0_variants_test full_props part_shapes neuro_layout_test
+GDK_TESTS=genoconv_test gdk_test geno_test neuro_test loader_test serial_test multiline_f0_test f0_variants_test full_props part_shapes neuro_layout_test genooper_test
 
 gdk_tests: $(GDK_TESTS)
@@ -47 +47 @@
         $(CXX) $(NEURO_LAYOUT_TEST_OBJS) -o $@
 
+genooper_test: $(GENOOPER_TEST_OBJS)
+        $(CXX) $(GENOOPER_TEST_OBJS) -o $@
+
 #############################################
 
-ALL_OBJS=$(GDK_TEST_OBJS) $(GENOCONV_TEST_OBJS) $(GENO_TEST_OBJS) $(NEURO_TEST_OBJS) $(LOADER_TEST_OBJS) $(SERIAL_TEST_OBJS) $(MULTILINE_F0_OBJS) $(F0_VARIANTS_OBJS) $(FULL_PROPS_OBJS) $(PART_SHAPES_OBJS) $(NEURO_LAYOUT_TEST_OBJS)
+ALL_OBJS=$(GDK_TEST_OBJS) $(GENOCONV_TEST_OBJS) $(GENO_TEST_OBJS) $(NEURO_TEST_OBJS) $(LOADER_TEST_OBJS) $(SERIAL_TEST_OBJS) $(MULTILINE_F0_OBJS) $(F0_VARIANTS_OBJS) $(FULL_PROPS_OBJS) $(PART_SHAPES_OBJS) $(NEURO_LAYOUT_TEST_OBJS) $(GENOOPER_TEST_OBJS)
 
 include frams/Makefile-maintain

cpp/frams/Makefile-GDK-files

@@ -5 +5 @@
 
 GENOCONV_GDK_OBJS=frams/genetics/f1/conv_f1.o frams/genetics/f9/conv_f9.o
+GENMAN_GDK_OBJS=frams/genetics/f9/oper_f9.o
 
 GDK_OBJS=frams/util/list.o frams/util/advlist.o frams/param/param.o frams/util/sstring.o frams/util/sstringutils.o frams/util/3d.o frams/vm/classes/3dobject.o frams/model/model.o frams/model/modelparts.o frams/neuro/neurolibrary.o frams/genetics/geno.o frams/genetics/genoconv.o frams/util/extvalue.o frams/vm/classes/collectionobj.o frams/util/hashtable.o common/framsg.o frams/util/callbacks.o frams/param/syntparam.o frams/util/multirange.o frams/util/multimap.o frams/param/paramtabobj.o frams/genetics/defgenoconv.o frams/errmgr/errmanager.o frams/param/paramobj.o frams/genetics/oper_fx.o common/nonstd_math.o frams/errmgr/stderrors.o common/Convert.o frams/util/rndutil.o
@@ -34 +35 @@
 
 NEURO_LAYOUT_TEST_OBJS= frams/_demos/neuro_layout_test.o frams/virtfile/virtfile.o frams/errmgr/stdouterr.o $(GDK_OBJS) $(GENOCONV_GDK_OBJS) frams/canvas/nn_layout_model.o frams/canvas/nn_simple_layout.o frams/canvas/nn_smart_layout.o
+
+GENOOPER_TEST_OBJS=frams/_demos/genooper_test.o frams/virtfile/virtfile.o frams/errmgr/stdouterr.o $(GDK_OBJS) $(GENOCONV_GDK_OBJS) $(GENMAN_GDK_OBJS) frams/genetics/genman.o frams/param/mutableparam.o frams/param/mutparamlist.o frams/neuro/geneticneuroparam.o frams/neuro/neurolibparam.o frams/vm/classes/genoobj.o frams/model/autoname.o

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

@@ -26 +26 @@
 //#define USE_GENMAN_F4
 //#define USE_GENMAN_F5
+#define USE_GENMAN_F9