Changeset 960

Timestamp:

06/26/20 01:31:36 (5 years ago)

Author:

Maciej Komosinski

Message:

Simplified code and fixed a bug where all existing non-default property values of a neuron would be lost before its mutation (affected fH, fB, fL)

File:

• cpp/frams/genetics/fH/fH_oper.cpp (modified) (1 diff)

cpp/frams/genetics/fH/fH_oper.cpp

@@ -426 +426 @@
 }
 
-void Geno_fH::mutateNeuronProperties(SString &det)
+void Geno_fH::mutateNeuronProperties(SString &det) //used also by the "fB" and "fL" encodings
 {
         Neuro neu;
-        det = det == "" ? "N" : det;
         neu.setDetails(det == "" ? "N" : det);
-
-        SyntParam par = neu.classProperties();
-
-        if (par.getPropCount() > 0)
-        {
-                int i = rndUint(par.getPropCount());
-                if (*par.type(i) == 'f')
-                {
-                        double change = mutateNeuronProperty(par.getDouble(i), &neu, GenoOperators::NEUROCLASS_PROP_OFFSET + i);
-                        par.setDouble(i, change);
-                }
-                SString line;
-                int tmp = 0;
-                par.update(&line);
-                SString props;
-                line.getNextToken(tmp, props, '\n'); // removal of newline character
-                if (props != "")
-                {
-                        det = neu.getClass()->name;
-                        det += ": ";
-                        det += props;
-                }
-        }
+        GenoOperators::mutateRandomNeuronOrNeuroclassProperty(&neu);
+        det = neu.getDetails();
 }
 
 void Geno_fH::mutateNeuronHandleProperties(fH_NeuronHandle *handle, ParamEntry *tab, bool userandomclass)
 {
-        Neuro neu;
         Param hpar(tab, handle->obj);
-        SString det = hpar.getStringById("d");
-        neu.setDetails(det == "" ? "N" : det);
-        NeuroClass *nc = neu.getClass();
-
+        SString det;
         if (userandomclass)
         {
-                nc = getRandomNeuroClass(Model::SHAPE_BALL_AND_STICK);
-                // checking of neuron class availability should be done before
-        }
-
-        det = nc->getName();
-
+                NeuroClass *nc = getRandomNeuroClass(Model::SHAPE_BALL_AND_STICK); // checking that neuron classes are available should be done before
+                det = nc->getName();
+        }
+        else
+        {
+                det = hpar.getStringById("d");
+        }
         mutateNeuronProperties(det);
-
         hpar.setStringById("d", det);
 }