Changeset 957 for cpp/frams/genetics/genooperators.cpp

Timestamp:

06/25/20 16:31:25 (4 years ago)

Author:

Maciej Komosinski

Message:

Replace magic "100" with GenoOperators::NEUROCLASS_PROP_OFFSET

File:

• cpp/frams/genetics/genooperators.cpp (modified) (4 diffs)

cpp/frams/genetics/genooperators.cpp

@@ -76 +76 @@
 }
 
-int GenoOperators::selectRandomNeuProperty(Neuro *n)
+int GenoOperators::selectRandomNeuronProperty(Neuro *n)
 {
         int neuext = n->extraProperties().getPropCount(),
@@ -82 +82 @@
         if (neuext + neucls == 0) return -1; //no properties in this neuron
         int index = rndUint(neuext + neucls);
-        if (index >= neuext) index = index - neuext + 100;
+        if (index >= neuext) index = index - neuext + NEUROCLASS_PROP_OFFSET;
         return index;
 }
 
-double GenoOperators::mutateNeuProperty(double current, Neuro *n, int i)
+double GenoOperators::mutateNeuronProperty(double current, Neuro *n, int i)
 {
         if (i == -1) return mutateCreepNoLimit('f', current, 2, true); //i==-1: mutating weight of neural connection
         Param p;
-        if (i >= 100) { i -= 100; p = n->getClass()->getProperties(); }
+        if (i >= NEUROCLASS_PROP_OFFSET) { i -= NEUROCLASS_PROP_OFFSET; p = n->getClass()->getProperties(); }
         else p = n->extraProperties();
         double newval = current;
@@ -354 +354 @@
                         const char *n = p.id(i);
                         int l = (int)strlen(n);
-                        if (len >= l && l > Len && (strncmp(s, n, l) == 0)) { I = 100 + i; Len = l; }
+                        if (len >= l && l > Len && (strncmp(s, n, l) == 0)) { I = NEUROCLASS_PROP_OFFSET + i; Len = l; }
                         if (also_v1_N_props) //recognize old properties symbols /=!
                         {
@@ -361 +361 @@
                                                 if (strcmp(n, "fo") == 0) n = "!";
                                 l = (int)strlen(n);
-                                if (len >= l && l > Len && (strncmp(s, n, l) == 0)) { I = 100 + i; Len = l; }
+                                if (len >= l && l > Len && (strncmp(s, n, l) == 0)) { I = NEUROCLASS_PROP_OFFSET + i; Len = l; }
                         }
                 }