Changeset 968 for cpp

Timestamp:

06/30/20 00:30:39 (4 years ago)

Author:

Maciej Komosinski

Message:

Introduced a separate function to mutate neuron connection weight

Location:

cpp/frams/genetics

Files:

• f4/f4_oper.cpp (modified) (2 diffs)
• fH/fH_oper.cpp (modified) (1 diff)
• genooperators.cpp (modified) (8 diffs)
• genooperators.h (modified) (2 diffs)

cpp/frams/genetics/f4/f4_oper.cpp

@@ -451 +451 @@
         }
         // weight
-        nn->f1 = GenoOperators::getMutatedNeuroClassProperty(nn->f1, NULL, -1);
+        nn->f1 = GenoOperators::getMutatedNeuronConnectionWeight(nn->f1);
         //nn->f1 = 10.0f * (rndDouble(1) - 0.5f);
 }
@@ -488 +488 @@
                 break;
         case 2: // change weight
-                nn->f1 = GenoOperators::getMutatedNeuroClassProperty(nn->f1, NULL, -1);
+                nn->f1 = GenoOperators::getMutatedNeuronConnectionWeight(nn->f1);
                 //nn->f1 += 1.0f * (rndDouble(1) - 0.5f);
                 break;

cpp/frams/genetics/fH/fH_oper.cpp

@@ -390 +390 @@
                         // if it is weight, then method needs to use mutateNeuProperty
                         double current = par.getDouble(id);
-                        par.setDouble(id, getMutatedNeuroClassProperty(current, NULL, -1));
+                        par.setDouble(id, getMutatedNeuronConnectionWeight(current));
                 }
         }

cpp/frams/genetics/genooperators.cpp

@@ -9 +9 @@
 #include <frams/util/rndutil.h>
 
+//
+// custom distributions for mutations of various parameters
+//
 static double distrib_force[] =   // for '!'
 {
@@ -31 +34 @@
         -1, 1,         // ~linear
 };
-
+/*
+static double distrib_weight[] =
+{
+5,                 // distribution -999 _-^_^-_ +999
+-999, 999,         // each weight value may be useful, especially...
+-5, -0.3,          // ...little non-zero values
+-3, -0.6,
+0.6, 3,
+0.3, 5,
+};
+*/
 
 int GenoOperators::roulette(const double *probtab, const int count)
@@ -108 +121 @@
 double GenoOperators::getMutatedNeuroClassProperty(double current, Neuro *n, int i)
 {
-        if (i == -1) return mutateCreepNoLimit('f', current, 2, true); //i==-1: mutating weight of neural connection
+        if (i == -1)
+        {
+                logPrintf("GenoOperators", "getMutatedNeuroClassProperty", LOG_WARN, "Deprecated usage in C++ source: to mutate connection weight, use getMutatedNeuronConnectionWeight().");
+                return getMutatedNeuronConnectionWeight(current);
+        }
         Param p;
         if (i >= NEUROCLASS_PROP_OFFSET) { i -= NEUROCLASS_PROP_OFFSET; p = n->getClass()->getProperties(); }
@@ -117 +134 @@
 }
 
+double GenoOperators::getMutatedNeuronConnectionWeight(double current)
+{
+        return mutateCreepNoLimit('f', current, 2, true);
+}
+
 bool GenoOperators::mutatePropertyNaive(ParamInterface &p, int i)
 {
@@ -145 +167 @@
         if (p.type(i)[0] != 'f' && p.type(i)[0] != 'd') return false; //don't know how to mutate
         const char *n = p.id(i), *na = p.name(i);
-        if (strcmp(n, "si") == 0 && strcmp(na, "Sigmoid") == 0) newval = CustomRnd(distrib_sigmo); else
-                if (strcmp(n, "in") == 0 && strcmp(na, "Inertia") == 0) newval = CustomRnd(distrib_inertia); else
-                        if (strcmp(n, "fo") == 0 && strcmp(na, "Force") == 0) newval = CustomRnd(distrib_force); else
+        if (strcmp(n, "si") == 0 && strcmp(na, "Sigmoid") == 0) newval = round(CustomRnd(distrib_sigmo), 3); else
+                if (strcmp(n, "in") == 0 && strcmp(na, "Inertia") == 0) newval = round(CustomRnd(distrib_inertia), 3); else
+                        if (strcmp(n, "fo") == 0 && strcmp(na, "Force") == 0) newval = round(CustomRnd(distrib_force), 3); else
                         {
                                 double mn, mx, df;
@@ -167 +189 @@
         {
                 if (limit_precision_3digits)
-                        result = floor(result * 1000 + 0.5) / 1000.0; //round
+                        result = round(result, 3);
         }
         return result;
@@ -186 +208 @@
                 {
                         //reflect and wrap above may have changed the (limited) precision, so try to round again (maybe unnecessarily, because we don't know if reflect+wrap above were triggered)
-                        double result_try = floor(result * 1000 + 0.5) / 1000.0; //round
+                        double result_try = round(result, 3);
                         if (mn <= result_try && result_try <= mx) result = result_try; //after rounding still witin allowed range, so keep rounded value
                 }
@@ -375 +397 @@
                         int l = (int)strlen(n);
                         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 /=!
+                        if (also_v1_N_props) //recognize old symbols of properties:  /=!
                         {
                                 if (strcmp(n, "si") == 0) n = "/"; else

cpp/frams/genetics/genooperators.h

@@ -187 +187 @@
         static bool mutateRandomNeuroClassProperty(Neuro* n); ///<high-level neuron mutation function, will select and mutate a random property of Neuron's NeuroClass. Returns true if successful and some property was actually mutated. Could return false when the NeuroClass of the Neuron have no properties, or when a randomly selected property was not suitable for mutation (for example a string or another non-number type).
         static int selectRandomNeuroClassProperty(Neuro* n); ///<selects random property (either 0-based extraproperty of NeuroClass or NEUROCLASS_PROP_OFFSET-based standard property of NeuroClass). -1 if Neuroclass has no properties.
-        static double getMutatedNeuroClassProperty(double current, Neuro *n, int propindex); ///<returns value \e current mutated for the property \e propindex of Neuron's NeuroClass or for extraproperty (\e propindex - NEUROCLASS_PROP_OFFSET) of Neuron's NeuroClass. Neuro \e n is used as read-only. Use \e propindex == -1 to mutate connection weight (\e n and \e i are then ignored).
+        static double getMutatedNeuroClassProperty(double current, Neuro *n, int propindex); ///<returns value \e current mutated for the property \e propindex of Neuron's NeuroClass or for extraproperty (\e propindex - NEUROCLASS_PROP_OFFSET) of Neuron's NeuroClass. Neuro \e n is used as read-only.
+        static double getMutatedNeuronConnectionWeight(double current); ///<returns mutated value of \e current.
         static bool mutatePropertyNaive(ParamInterface &p, int propindex); ///<creep-mutate selected property. Returns true when success. mutateProperty() should be used instead of this function.
         static bool mutateProperty(ParamInterface &p, int propindex); ///<like mutatePropertyNaive(), but uses special probability distributions for some neuron properties.
@@ -216 +217 @@
 };
 
-
-//
-// custom distributions for mutations of various parameters
-//
-/*
-static double distrib_weight[]=
-{
-5,                 // distribution -999 _-^_^-_ +999
--999, 999,         // each weight value may be useful, especially...
--5, -0.3,        // ...little non-zero values
--3, -0.6,
-0.6, 3,
-0.3, 5,
-};
-*/
-
 #endif