Changeset 1273 for cpp/frams/genetics/fH/fH_oper.cpp

Timestamp:

09/09/23 15:10:49 (8 months ago)

Author:

Maciej Komosinski

Message:

fH, fB, fL: improved default parameter values, syntax coloring and code logic

File:

• cpp/frams/genetics/fH/fH_oper.cpp (modified) (3 diffs)

cpp/frams/genetics/fH/fH_oper.cpp

@@ -14 +14 @@
 {
         { "Genetics: fH", 1, FH_OPCOUNT + FH_ADD_OPCOUNT, },
-        { "fH_mut_addition", 0, 0, "Add element", "f 0 100 30", FIELD(operations[FH_ADD]), "Probability of adding new element to genotype", },
-        { "fH_mut_add_joint", 0, 0, " - add joint", "f 0 100 33", FIELD(addoperations[FH_ADD_STICK]), "Probability of adding new stick handle", },
-        { "fH_mut_add_neuron", 0, 0, " - add neuron", "f 0 100 33", FIELD(addoperations[FH_ADD_NEURO]), "Probability of adding new neuron handle", },
-        { "fH_mut_add_connection", 0, 0, " - add neural connection", "f 0 100 33", FIELD(addoperations[FH_ADD_CONN]), "Probability of adding new neuron connection handle", },
-        { "fH_mut_deletion", 0, 0, "Delete element", "f 0 100 10", FIELD(operations[FH_DEL]), "Probability of removing element from genotype", },
-        { "fH_mut_handle", 0, 0, "Modify vectors of handles", "f 0 100 30", FIELD(operations[FH_HANDLE]), "Probability of changing values in vectors of handle", },
-        { "fH_mut_property", 0, 0, "Modify properties of handles", "f 0 100 30", FIELD(operations[FH_PROP]), "Probability of changing properties of handles", },
+        { "fH_mut_addition", 0, 0, "Add element", "f 0 100 4", FIELD(operations[FH_ADD]), "Probability of adding a new element", },
+        { "fH_mut_add_joint", 0, 0, " - add joint", "f 0 100 4", FIELD(addoperations[FH_ADD_STICK]), "Probability of adding a new stick handle", },
+        { "fH_mut_add_neuron", 0, 0, " - add neuron", "f 0 100 3", FIELD(addoperations[FH_ADD_NEURO]), "Probability of adding a new neuron handle", },
+        { "fH_mut_add_connection", 0, 0, " - add neural connection", "f 0 100 1", FIELD(addoperations[FH_ADD_CONN]), "Probability of adding a new neuron connection handle", },
+        { "fH_mut_deletion", 0, 0, "Delete element", "f 0 100 4", FIELD(operations[FH_DEL]), "Probability of removing an element", },
+        { "fH_mut_handle", 0, 0, "Modify vectors of handles", "f 0 100 1", FIELD(operations[FH_HANDLE]), "Probability of changing values in vectors of a handle", },
+        { "fH_mut_property", 0, 0, "Modify properties of handles", "f 0 100 4", FIELD(operations[FH_PROP]), "Probability of changing properties of handles", },
         { 0, },
 };
@@ -53 +53 @@
                 return 1;
         }
-        return 0;
+        return GENOPER_OK;
 }
 
@@ -63 +63 @@
         fH_Builder builder;
         int err = builder.parseGenotype(geno);
-        // if parsing failed, then it is impossible to repair genotype
+        // if parsing failed, then it is impossible to repair the genotype
         if (err != 0)
         {
-                return GENOPER_OPFAIL;
-        }
-        // method removes definitions of neurons that have invalid genotype
+                return GENOPER_OK;
+        }
+        // method removes definitions of neurons that have an invalid genotype
         int amount = builder.removeNeuronsWithInvalidClasses();
-        // if there were any warnings, then rewrite genotype
+        // if there were any warnings, then rewrite the genotype
         if (eh.getErrorWarningCount() > 0 || amount > 0)
         {