Changeset 896 for cpp/frams/genetics/f4

Timestamp:

11/30/19 01:30:22 (5 years ago)

Author:

Maciej Komosinski

Message:

Replaced #defined macros for popular random-related operations with functions

Location:

cpp/frams/genetics/f4

Files:

• f4_general.cpp (modified) (2 diffs)
• f4_oper.cpp (modified) (9 diffs)

cpp/frams/genetics/f4/f4_general.cpp

@@ -1210 +1210 @@
         int n = count();
         // pick a random node, between 0 and n-1
-        return ordNode(randomN(n));
+        return ordNode(rndUint(n));
 }
 
@@ -1355 +1355 @@
 {
         int i, j, res, t;
-        char tc1, tc2, tc3; // tc3 is only to ensure that in the end  of neuron parameter definition
+        char tc1, tc2, tc3; // tc3 is only to ensure that neuron parameter definition is completed
         int relfrom;
         double w;

cpp/frams/genetics/f4/f4_oper.cpp

@@ -158 +158 @@
                         // "X>" or "N>"
                         f4_node *n5 = NULL;
-                        double pr = rnd01;
+                        double pr = rndDouble(1);
                         pr -= 0.5;
                         if (pr < 0) n5 = new f4_node('X', n2, n2->pos);
@@ -204 +204 @@
                         n1->parent = n2;
                         // now with 50% chance swap children
-                        if (randomN(2) == 0)
+                        if (rndUint(2) == 0)
                         {
                                 n3 = n2->child;
@@ -275 +275 @@
                         // choose a simple node from ADD_SIMPLE_CODES
                         n1->parent->removeChild(n1);
-                        //f4_node *n2 = new f4_node(ADD_SIMPLE_CODES[randomN(strlen(ADD_SIMPLE_CODES))], n1->parent, n1->parent->pos);
+                        //f4_node *n2 = new f4_node(ADD_SIMPLE_CODES[rndUint(strlen(ADD_SIMPLE_CODES))], n1->parent, n1->parent->pos);
                         int modifierid = GenoOperators::getRandomChar(all_modifiers, excluded_modifiers.c_str());
                         f4_node *n2 = new f4_node(all_modifiers[modifierid], n1->parent, n1->parent->pos);
@@ -333 +333 @@
                                 n2->removeChild(n1);
                                 // n1 has two children. pick one randomly 50-50, destroy other
-                                if (randomN(2) == 0)
+                                if (rndUint(2) == 0)
                                 {
                                         n1->child->parent = n2;
@@ -429 +429 @@
 
         // 35% chance one of *GTS
-        prob1 = rnd01;
+        prob1 = rndDouble(1);
         prob1 -= 0.35f;
         if (prob1 < 0)
@@ -468 +468 @@
         case 0: // change type
                 // 80% for link, 20% for random sensor
-                if (rnd01 < 0.2f)
+                if (rndDouble(1) < 0.2f)
                 {
                         cl = GenoOperators::getRandomNeuroClassWithOutputAndNoInputs();
@@ -497 +497 @@
 void Geno_f4::nparNodeMakeRandom(f4_node *nn) const
 {
-        int sign = (int)(2.0f * rnd01);
-        int param = (int)(3.0f * rnd01);
+        int sign = (int)rndDouble(2);
+        int param = (int)rndDouble(3);
         if (param > 2) param = 2;
         nn->l1 = sign;
@@ -512 +512 @@
         // change count
         count = nn->i1;
-        prob1 = rnd01;
+        prob1 = rndDouble(1);
         if (prob1 < 0.5f) count++;
         else count--;
@@ -699 +699 @@
         // decide amounts of crossover, 0.25-0.75
         // adam: seems 0.1-0.9 -- MacKo
-        chg1 = 0.1f + 0.8f*rnd01;
-        chg2 = 0.1f + 0.8f*rnd01;
+        chg1 = 0.1 + rndDouble(0.8);
+        chg2 = 0.1 + rndDouble(0.8);
 
         copy1 = root1.duplicate();