Changeset 999 for cpp/frams/genetics

Timestamp:

07/13/20 13:51:43 (4 years ago)

Author:

Maciej Komosinski

Message:

More consistent usage of "shapetype" (vs. "shape")

Location:

cpp/frams/genetics

Files:

• f4/f4_oper.cpp (modified) (3 diffs)
• fB/fB_oper.cpp (modified) (1 diff)
• fH/fH_oper.cpp (modified) (2 diffs)
• fL/fL_oper.cpp (modified) (2 diffs)
• geno.cpp (modified) (1 diff)
• genoconv.h (modified) (1 diff)

cpp/frams/genetics/f4/f4_oper.cpp

@@ -164 +164 @@
                         {
                                 // make neuron
-                                NeuroClass *rndclass = GenoOperators::getRandomNeuroClass(Model::SHAPE_BALL_AND_STICK);
+                                NeuroClass *rndclass = GenoOperators::getRandomNeuroClass(Model::SHAPETYPE_BALL_AND_STICK);
                                 if (rndclass == NULL)
                                 {
@@ -434 +434 @@
         {
                 // '*', 'G', 'T', or 'S', 1/4 chance each
-                nc = GenoOperators::getRandomNeuroClassWithOutputAndNoInputs(Model::SHAPE_BALL_AND_STICK);
+                nc = GenoOperators::getRandomNeuroClassWithOutputAndNoInputs(Model::SHAPETYPE_BALL_AND_STICK);
         }
         if (nc != NULL)
@@ -470 +470 @@
                 if (rndDouble(1) < 0.2f)
                 {
-                        cl = GenoOperators::getRandomNeuroClassWithOutputAndNoInputs(Model::SHAPE_BALL_AND_STICK);
+                        cl = GenoOperators::getRandomNeuroClassWithOutputAndNoInputs(Model::SHAPETYPE_BALL_AND_STICK);
                         if (cl != NULL)
                         {

cpp/frams/genetics/fB/fB_oper.cpp

@@ -287 +287 @@
                 int rndid = rndUint(tokenized.size()); // select random insertion point
                 std::advance(it, rndid);
-                NeuroClass *cls = getRandomNeuroClass(Model::SHAPE_BALL_AND_STICK);
+                NeuroClass *cls = getRandomNeuroClass(Model::SHAPETYPE_BALL_AND_STICK);
                 if (cls)
                 {

cpp/frams/genetics/fH/fH_oper.cpp

@@ -255 +255 @@
                 fH_Handle *handle = NULL;
                 method = FH_OPCOUNT + roulette(addoperations, FH_ADD_OPCOUNT);
-                if (getActiveNeuroClassCount(Model::SHAPE_BALL_AND_STICK) == 0) method = FH_OPCOUNT + FH_ADD_STICK;
+                if (getActiveNeuroClassCount(Model::SHAPETYPE_BALL_AND_STICK) == 0) method = FH_OPCOUNT + FH_ADD_STICK;
                 switch (method - FH_OPCOUNT)
                 {
@@ -440 +440 @@
         if (userandomclass)
         {
-                NeuroClass *nc = getRandomNeuroClass(Model::SHAPE_BALL_AND_STICK); // checking that neuron classes are available should be done before
+                NeuroClass *nc = getRandomNeuroClass(Model::SHAPETYPE_BALL_AND_STICK); // checking that neuron classes are available should be done before
                 det = nc->getName();
         }

cpp/frams/genetics/fL/fL_oper.cpp

@@ -141 +141 @@
                 {
                         SString det;
-                        NeuroClass *cls = getRandomNeuroClass(Model::SHAPE_BALL_AND_STICK);
+                        NeuroClass *cls = getRandomNeuroClass(Model::SHAPETYPE_BALL_AND_STICK);
                         det = cls->getName();
                         Geno_fH::mutateNeuronProperties(det);
@@ -201 +201 @@
                         return creature->words["S"];
                 case FL_ADD_NEURO:
-                        if (getActiveNeuroClassCount(Model::SHAPE_BALL_AND_STICK) == 0)
+                        if (getActiveNeuroClassCount(Model::SHAPETYPE_BALL_AND_STICK) == 0)
                                 return creature->words["S"];
                         else

cpp/frams/genetics/geno.cpp

@@ -260 +260 @@
         if (Geno::formatIsOneOf(g.getFormat(), Geno::F0_FORMAT_LIST))
         {
-                Model mod(g, Model::SHAPE_UNKNOWN);
+                Model mod(g, Model::SHAPETYPE_UNKNOWN);
                 return mod.isValid();
         }

cpp/frams/genetics/genoconv.h

@@ -34 +34 @@
 
 /// Base class for all Geno Converters.
-/// In constructor you have to set public fields
-/// indicating your identity and supported formats.
+/// In constructor you have to set public fields indicating your identity and supported formats.
 /// Each converter serves one in-out format pair.
-/// Instance of your converter should be registered
-/// in GenoConvManager.
+/// The instance of your converter should be registered in GenoConvManager.
 class GenoConverter
 {
 public:
         const char *name;       //< converter name (short)
-        SString in_format,      //< input format, eg. "1"
-                out_format;     //< output format, eg. "0"
+        SString in_format,      //< input format, e.g. "1"
+                out_format;     //< output format, e.g. "0"
         paInt enabled;  //< don't touch this! (used by configuration module)
         paInt mapsupport; //< set to 1 if your converter supports genotype mapping