Changeset 779

Timestamp:

05/11/18 23:42:04 (7 years ago)

Author:

Maciej Komosinski

Message:

Unified file names of all files involved in genetic conversions and operations so that they start with "f<format>_"

Location:

cpp/frams

Files:

• Makefile-SDK-files (modified) (2 diffs)
• _demos/genooper_test_fTest.cpp (modified) (1 diff)
• genetics/defgenoconv.cpp (modified) (1 diff)
• genetics/f1/f1_conv.cpp (moved) (moved from cpp/frams/genetics/f1/conv_f1.cpp) (1 diff)
• genetics/f1/f1_conv.h (moved) (moved from cpp/frams/genetics/f1/conv_f1.h) (1 diff)
• genetics/f4/f4_conv.cpp (moved) (moved from cpp/frams/genetics/f4/conv_f4.cpp) (1 diff)
• genetics/f4/f4_conv.h (moved) (moved from cpp/frams/genetics/f4/conv_f4.h) (1 diff)
• genetics/f4/f4_general.cpp (modified) (1 diff)
• genetics/f4/f4_oper.cpp (moved) (moved from cpp/frams/genetics/f4/oper_f4.cpp) (1 diff)
• genetics/f4/f4_oper.h (moved) (moved from cpp/frams/genetics/f4/oper_f4.h) (1 diff)
• genetics/f9/f9_conv.cpp (moved) (moved from cpp/frams/genetics/f9/conv_f9.cpp) (1 diff)
• genetics/f9/f9_conv.h (moved) (moved from cpp/frams/genetics/f9/conv_f9.h) (1 diff)
• genetics/f9/f9_oper.cpp (moved) (moved from cpp/frams/genetics/f9/oper_f9.cpp) (1 diff)
• genetics/f9/f9_oper.h (moved) (moved from cpp/frams/genetics/f9/oper_f9.h) (1 diff)
• genetics/fF/fF_chamber3d.cpp (modified) (1 diff)
• genetics/fF/fF_chamber3d.h (modified) (1 diff)
• genetics/fF/fF_conv.cpp (moved) (moved from cpp/frams/genetics/fF/conv_fF.cpp) (1 diff)
• genetics/fF/fF_conv.h (moved) (moved from cpp/frams/genetics/fF/conv_fF.h) (2 diffs)
• genetics/fF/fF_oper.cpp (moved) (moved from cpp/frams/genetics/fF/oper_fF.cpp) (1 diff)
• genetics/fF/fF_oper.h (moved) (moved from cpp/frams/genetics/fF/oper_fF.h) (1 diff)
• genetics/fT/fTest_oper.cpp (moved) (moved from cpp/frams/genetics/fT/oper_fTest.cpp) (1 diff)
• genetics/fT/fTest_oper.h (moved) (moved from cpp/frams/genetics/fT/oper_fTest.h) (1 diff)
• genetics/fn/fn_conv.cpp (moved) (moved from cpp/frams/genetics/fn/conv_fn.cpp) (1 diff)
• genetics/fn/fn_conv.h (moved) (moved from cpp/frams/genetics/fn/conv_fn.h) (1 diff)
• genetics/fn/fn_oper.cpp (moved) (moved from cpp/frams/genetics/fn/oper_fn.cpp) (1 diff)
• genetics/fn/fn_oper.h (moved) (moved from cpp/frams/genetics/fn/oper_fn.h) (1 diff)
• genetics/genman.cpp (modified) (1 diff)
• genetics/genman.h (modified) (1 diff)
• genetics/genooperators.cpp (moved) (moved from cpp/frams/genetics/oper_fx.cpp) (1 diff)
• genetics/genooperators.h (moved) (moved from cpp/frams/genetics/oper_fx.h)

cpp/frams/Makefile-SDK-files

@@ -4 +4 @@
 ALL_DIRS={common,frams,frams/canvas,frams/config,common/loggers,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/fn,frams/genetics/fF,frams/genetics/fT,frams/model,frams/neuro,frams/neuro/impl,frams/param,frams/test,frams/util,frams/vm/classes,common/virtfile,frams/_demos,frams/model/geometry,frams/_demos/geometry,frams/model/similarity,frams/model/similarity/SVD}
 
-GENMANF4=frams/genetics/f4/oper_f4.o
-GENMANF9=frams/genetics/f9/oper_f9.o
-GENMANFF=frams/genetics/fF/oper_fF.o
-GENMANFT=frams/genetics/fT/oper_fTest.o
-GENMANFN=frams/genetics/fn/oper_fn.o
+GENMANF4=frams/genetics/f4/f4_oper.o
+GENMANF9=frams/genetics/f9/f9_oper.o
+GENMANFF=frams/genetics/fF/fF_oper.o
+GENMANFT=frams/genetics/fT/fTest_oper.o
+GENMANFN=frams/genetics/fn/fn_oper.o
 
-CONVF1=frams/genetics/f1/conv_f1.o frams/genetics/geneprops.o
-CONVF4=frams/genetics/f4/conv_f4.o frams/genetics/f4/f4_general.o frams/genetics/geneprops.o
-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
+CONVF1=frams/genetics/f1/f1_conv.o frams/genetics/geneprops.o
+CONVF4=frams/genetics/f4/f4_conv.o frams/genetics/f4/f4_general.o frams/genetics/geneprops.o
+CONVF9=frams/genetics/f9/f9_conv.o
+CONVFF=frams/genetics/fF/fF_conv.o frams/genetics/fF/fF_genotype.o frams/genetics/fF/fF_chamber3d.o
+CONVFN=frams/genetics/fn/fn_conv.o
 
 # $(sort - remove duplicates
@@ -22 +22 @@
 GENMAN_COMMON_OBJS=frams/genetics/genman.o frams/param/mutableparam.o frams/param/mutparamlist.o frams/neuro/geneticneuroparam.o frams/neuro/neurolibparam.o
 
-SDK_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/log.o common/stl-util.o common/nonstd_stdio.o frams/util/callbacks.o frams/param/syntparam.o frams/util/multirange.o frams/util/multimap.o frams/param/paramtabobj.o common/loggers/loggers.o frams/param/paramobj.o frams/genetics/oper_fx.o common/nonstd_math.o frams/util/validitychecks.o common/Convert.o frams/util/rndutil.o common/virtfile/stringfile.o
+SDK_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/log.o common/stl-util.o common/nonstd_stdio.o frams/util/callbacks.o frams/param/syntparam.o frams/util/multirange.o frams/util/multimap.o frams/param/paramtabobj.o common/loggers/loggers.o frams/param/paramobj.o frams/genetics/genooperators.o common/nonstd_math.o frams/util/validitychecks.o common/Convert.o frams/util/rndutil.o common/virtfile/stringfile.o
 
 GEOMETRY_OBJS=frams/model/geometry/meshbuilder.o frams/model/geometry/modelgeometryinfo.o frams/model/geometry/geometryutils.o

cpp/frams/_demos/genooper_test_fTest.cpp

@@ -3 +3 @@
 // See LICENSE.txt for details.
 
-#include <frams/genetics/fT/oper_fTest.h>
+#include <frams/genetics/fT/fTest_oper.h>
 
 GenoOper_fTest gft;

cpp/frams/genetics/defgenoconv.cpp

@@ -8 +8 @@
 
 #ifdef USE_GENCONV_f10
-#include "f1/conv_f1.h"
+#include "f1/f1_conv.h"
 #endif
 #ifdef USE_GENCONV_f20
-#include "f2/conv_f2.h"
+#include "f2/f2_conv.h"
 #endif
 #ifdef USE_GENCONV_f32
-#include "f3/conv_f3.h"
+#include "f3/f3_conv.h"
 #endif
 #ifdef USE_GENCONV_f40
-#include "f4/conv_f4.h"
+#include "f4/f4_conv.h"
 #endif
 #ifdef USE_GENCONV_f41_TEST
-#include "f4/conv_f4.h"
+#include "f4/f4_conv.h"
 #endif
 #ifdef USE_GENCONV_f50
-#include "f5/conv_f5.h"
+#include "f5/f5_conv.h"
 #endif
 #ifdef USE_GENCONV_f60
-#include "f6/geno_f6.h"
+#include "f6/f6_geno.h"
 #endif
 #ifdef USE_GENCONV_f70
-#include "f7/conv_f7.h"
+#include "f7/f7_conv.h"
 #endif
 #ifdef USE_GENCONV_f81     
-#include "f8/conv_f8tof1.h"
+#include "f8/f8_convtof1.h"
 #endif
 #ifdef USE_GENCONV_f90
-#include "f9/conv_f9.h"
+#include "f9/f9_conv.h"
 #endif
 #ifdef USE_GENCONV_fF0
-#include "fF/conv_fF.h"
+#include "fF/fF_conv.h"
 #endif
 #ifdef USE_GENCONV_fn0
-#include "fn/conv_fn.h"
+#include "fn/fn_conv.h"
 #endif
 

cpp/frams/genetics/f1/f1_conv.cpp

@@ -3 +3 @@
 // See LICENSE.txt for details.
 
-#include "conv_f1.h"
+#include "f1_conv.h"
 #include <common/nonstd_stl.h>
 #include <common/log.h>

cpp/frams/genetics/f1/f1_conv.h

@@ -3 +3 @@
 // See LICENSE.txt for details.
 
-#ifndef _CONV_F1_H
-#define _CONV_F1_H
+#ifndef _F1_CONV_H_
+#define _F1_CONV_H_
 
 #include <frams/genetics/genoconv.h>

cpp/frams/genetics/f4/f4_conv.cpp

@@ -7 +7 @@
 // 2018, Grzegorz Latosinski, added support for new API for neuron types and their properties
 
-#include "conv_f4.h"
+#include "f4_conv.h"
 #include <common/log.h>
-#include "../oper_fx.h" //for GENOPER_OK constant
+#include "../genooperators.h" //for GENOPER_OK constant
 
 #ifdef DMALLOC

cpp/frams/genetics/f4/f4_conv.h

@@ -7 +7 @@
 // 2018, Grzegorz Latosinski, added support for new API for neuron types and their properties
 
-#ifndef _CONV_F4_H_
-#define _CONV_F4_H_
+#ifndef _F4_CONV_H_
+#define _F4_CONV_H_
 
 #include <frams/model/model.h>

cpp/frams/genetics/f4/f4_general.cpp

@@ -7 +7 @@
 
 #include "f4_general.h"
-#include "../oper_fx.h" //for GENOPER_ constants
+#include "../genooperators.h" //for GENOPER_ constants
 #include <common/nonstd_stl.h>
 #include <common/log.h>

cpp/frams/genetics/f4/f4_oper.cpp

@@ -7 +7 @@
 // 2018, Grzegorz Latosinski, added support for new API for neuron types and their properties
 
-#include "oper_f4.h"
+#include "f4_oper.h"
 #include <frams/util/sstring.h>
 #include <common/log.h>

cpp/frams/genetics/f4/f4_oper.h

@@ -6 +6 @@
 // Copyright (C) since 2001 Maciej Komosinski
 
-#ifndef _GENO_F4_H_
-#define _GENO_F4_H_
+#ifndef _F4_OPER_H_
+#define _F4_OPER_H_
 
 #include <stdio.h>
 #include "f4_general.h"
 #include "common/nonstd.h"
-#include "../oper_fx.h"
+#include "../genooperators.h"
 #include <frams/param/param.h>
 

cpp/frams/genetics/f9/f9_conv.cpp

@@ -3 +3 @@
 // See LICENSE.txt for details.
 
-#include "conv_f9.h"
+#include "f9_conv.h"
 #include <frams/model/model.h>
 #include <string.h>

cpp/frams/genetics/f9/f9_conv.h

@@ -3 +3 @@
 // See LICENSE.txt for details.
 
-#ifndef _CONV_F9_H_
-#define _CONV_F9_H_
+#ifndef _F9_CONV_H_
+#define _F9_CONV_H_
 
 #include <ctype.h>

cpp/frams/genetics/f9/f9_oper.cpp

@@ -3 +3 @@
 // See LICENSE.txt for details.
 
-#include "oper_f9.h"
-#include "conv_f9.h"
+#include "f9_oper.h"
+#include "f9_conv.h"
 #include <common/nonstd.h> //randomN, rnd01
 

cpp/frams/genetics/f9/f9_oper.h

@@ -3 +3 @@
 // See LICENSE.txt for details.
 
-#ifndef _GENOOPER_F9_H_
-#define _GENOOPER_F9_H_
+#ifndef _F9_OPER_H_
+#define _F9_OPER_H_
 
-#include "../oper_fx.h"
+#include "../genooperators.h"
 
 

cpp/frams/genetics/fF/fF_chamber3d.cpp

@@ -4 +4 @@
 
 #include "fF_chamber3d.h"
-#include "conv_fF.h"
+#include "fF_conv.h"
 #include <iostream>
 

cpp/frams/genetics/fF/fF_chamber3d.h

@@ -3 +3 @@
 // See LICENSE.txt for details.
 
-#ifndef CHAMBER3D_H
-#define CHAMBER3D_H
+#ifndef _FF_CHAMBER3D_H_
+#define _FF_CHAMBER3D_H_
 
 struct fF_point;

cpp/frams/genetics/fF/fF_conv.cpp

@@ -3 +3 @@
 // See LICENSE.txt for details.
 
-#include "conv_fF.h"
+#include "fF_conv.h"
 #include "fF_genotype.h"
 #include <common/nonstd_stl.h>

cpp/frams/genetics/fF/fF_conv.h

@@ -3 +3 @@
 // See LICENSE.txt for details.
 
-#ifndef _CONV_FF_H_
-#define _CONV_FF_H_
+#ifndef _FF_CONV_H_
+#define _FF_CONV_H_
+
+
 
 #define fF_TOO_MUCH 0.75
@@ -56 +58 @@
 };
 
+
 #endif

cpp/frams/genetics/fF/fF_oper.cpp

@@ -3 +3 @@
 // See LICENSE.txt for details.
 
-#include "oper_fF.h"
+#include "fF_oper.h"
 #include "fF_genotype.h"
 #include <common/nonstd.h> //randomN, rnd01

cpp/frams/genetics/fF/fF_oper.h

@@ -3 +3 @@
 // See LICENSE.txt for details.
 
-#ifndef _GENOOPER_FF_H_
-#define _GENOOPER_FF_H_
+#ifndef _FF_OPER_H_
+#define _FF_OPER_H_
 
-#include "../oper_fx.h"
+#include "../genooperators.h"
 
 

cpp/frams/genetics/fT/fTest_oper.cpp

@@ -3 +3 @@
 // See LICENSE.txt for details.
 
-#include "oper_fTest.h"
+#include "fTest_oper.h"
 #include <common/nonstd.h> //randomN, rnd01
 

cpp/frams/genetics/fT/fTest_oper.h

@@ -3 +3 @@
 // See LICENSE.txt for details.
 
-#ifndef _GENOOPER_FTEST_H_
-#define _GENOOPER_FTEST_H_
+#ifndef _FTEST_OPER_H_
+#define _FTEST_OPER_H_
 
-#include "../oper_fx.h"
+#include "../genooperators.h"
 
 /** \file */

cpp/frams/genetics/fn/fn_conv.cpp

@@ -3 +3 @@
 // See LICENSE.txt for details.
 
-#include "conv_fn.h"
+#include "fn_conv.h"
 #include <frams/vm/classes/collectionobj.h>
 

cpp/frams/genetics/fn/fn_conv.h

@@ -3 +3 @@
 // See LICENSE.txt for details.
 
-#ifndef _CONV_Fn_H_
-#define _CONV_Fn_H_
+#ifndef _Fn_CONV_H_
+#define _Fn_CONV_H_
 
 #include <frams/genetics/genoconv.h>

cpp/frams/genetics/fn/fn_oper.cpp

@@ -3 +3 @@
 // See LICENSE.txt for details.
 
-#include "oper_fn.h"
-#include "conv_fn.h"
+#include "fn_oper.h"
+#include "fn_conv.h"
 #include <common/nonstd.h> //randomN, rnd01
 

cpp/frams/genetics/fn/fn_oper.h

@@ -3 +3 @@
 // See LICENSE.txt for details.
 
-#ifndef _GENOOPER_Fn_H_
-#define _GENOOPER_Fn_H_
+#ifndef _Fn_OPER_H_
+#define _Fn_OPER_H_
 
-#include "../oper_fx.h"
+#include "../genooperators.h"
 
 

cpp/frams/genetics/genman.cpp

@@ -19 +19 @@
 
 #ifdef USE_GENMAN_f0
-#include "f0/oper_f0.h"
+#include "f0/f0_oper.h"
 #endif
 #ifdef USE_GENMAN_f0FUZZY
-#include "f0/oper_f0Fuzzy.h"
+#include "f0/f0Fuzzy_oper.h"
 #endif
 #ifdef USE_GENMAN_f1
-#include "f1/oper_f1.h"
+#include "f1/f1_oper.h"
 #endif
 #ifdef USE_GENMAN_f2
-#include "f2/oper_f2.h"
+#include "f2/f2_oper.h"
 #endif
 #ifdef USE_GENMAN_f2
-#include "f3/oper_f3.h"
+#include "f3/f3_oper.h"
 #endif
 #ifdef USE_GENMAN_f4
-#include "f4/oper_f4.h"
+#include "f4/f4_oper.h"
 #endif
 #ifdef USE_GENMAN_f5
-#include "f5/oper_f5.h"
+#include "f5/f5_oper.h"
 #endif
 #ifdef USE_GENMAN_f6
-#include "f6/oper_f6.h"
+#include "f6/f6_oper.h"
 #endif
 #ifdef USE_GENMAN_f7
-#include "f7/oper_f7.h"
+#include "f7/f7_oper.h"
 #endif
 #ifdef USE_GENMAN_f8
-#include "f8/oper_f8.h"
+#include "f8/f8_oper.h"
 #endif
 #ifdef USE_GENMAN_f9
-#include "f9/oper_f9.h"
+#include "f9/f9_oper.h"
 #endif
 #ifdef USE_GENMAN_fF
-#include "fF/oper_fF.h"
+#include "fF/fF_oper.h"
 #endif
 #ifdef USE_GENMAN_fn
-#include "fn/oper_fn.h"
+#include "fn/fn_oper.h"
 #endif
 #ifdef USE_GENMAN_fT
-#include "fT/oper_fTest.h"
+#include "fT/fTest_oper.h"
 #endif
 

cpp/frams/genetics/genman.h

@@ -12 +12 @@
 #include <frams/neuro/geneticneuroparam.h>
 #include "geno.h"
-#include "oper_fx.h"
+#include "genooperators.h"
 
 #define GENSTYLE_COMMENT GENSTYLE_RGBS(0,150,0,GENSTYLE_BOLD)

cpp/frams/genetics/genooperators.cpp

@@ -4 +4 @@
 
 #include <ctype.h>  //isupper()
-#include "oper_fx.h"
+#include "genooperators.h"
 #include <common/log.h>
 #include <common/nonstd_math.h>