Changeset 140 for cpp

Timestamp:

02/20/14 17:53:33 (11 years ago)

Author:

sz

Message:

introducing the Foraminifera encoding (format 'F')

Location:

cpp

Files:

• common/stl-util.h (added)
• frams/Makefile-GDK-files (modified) (1 diff)
• frams/genetics/fF (added)
• frams/genetics/fF/conv_fF.cpp (added)
• frams/genetics/fF/conv_fF.h (added)
• frams/genetics/fF/fF_genotype.h (added)
• frams/genetics/fF/oper_fF.cpp (added)
• frams/genetics/fF/oper_fF.h (added)
• frams/genetics/gen-config-GDK.h (modified) (2 diffs)

cpp/frams/Makefile-GDK-files

@@ -2 +2 @@
 
 # ALL_DIRS is later expanded by the shell, no spaces/newlines allowed, or it breaks
-ALL_DIRS={common,frams,frams/canvas,frams/config,frams/errmgr,frams/genetics,frams/genetics/f0,frams/genetics/f1,frams/genetics/f2,frams/genetics/f3,frams/genetics/f4,frams/genetics/f5,frams/genetics/f6,frams/genetics/f7,frams/genetics/f8,frams/genetics/f9,frams/model,frams/neuro,frams/neuro/impl,frams/param,frams/test,frams/util,frams/vm/classes,frams/virtfile,frams/_demos}
+ALL_DIRS={common,frams,frams/canvas,frams/config,frams/errmgr,frams/genetics,frams/genetics/f0,frams/genetics/f1,frams/genetics/f2,frams/genetics/f3,frams/genetics/f4,frams/genetics/f5,frams/genetics/f6,frams/genetics/f7,frams/genetics/f8,frams/genetics/f9,frams/genetics/fF,frams/model,frams/neuro,frams/neuro/impl,frams/param,frams/test,frams/util,frams/vm/classes,frams/virtfile,frams/_demos}
 
-GENOCONV_GDK_OBJS=frams/genetics/f1/conv_f1.o frams/genetics/f9/conv_f9.o
-GENMAN_GDK_OBJS=frams/genetics/f9/oper_f9.o
+GENOCONV_GDK_OBJS=frams/genetics/f1/conv_f1.o frams/genetics/f9/conv_f9.o frams/genetics/fF/conv_fF.o
+GENMAN_GDK_OBJS=frams/genetics/f9/oper_f9.o frams/genetics/fF/oper_fF.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

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

@@ -19 +19 @@
 //#define USE_GENCONV_f50
 #define USE_GENCONV_f90
+#define USE_GENCONV_fF0
 
 //#define USE_GENMAN_f0
@@ -27 +28 @@
 //#define USE_GENMAN_f5
 #define USE_GENMAN_f9
+#define USE_GENMAN_fF