Changeset 896 for cpp/frams/genetics/fB

Timestamp:

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

Author:

Maciej Komosinski

Message:

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

File:

• cpp/frams/genetics/fB/fB_oper.cpp (modified) (14 diffs)

cpp/frams/genetics/fB/fB_oper.cpp

@@ -246 +246 @@
         {
                 std::list<SString> tokenized = tokenizeSequence(line);
-                int rndid = randomN(tokenized.size()); // select random letter from genotype
+                int rndid = rndUint(tokenized.size()); // select random letter from genotype
                 // increment/decrement character - when overflow happens, this method
                 // uses reflect method
@@ -254 +254 @@
                 if ((*it).len() == 1)
                 {
-                        if (randomN(2) == 0)
+                        if (rndUint(2) == 0)
                         {
                                 if ((*it)[0] == 'a') (*it).directWrite()[0] = 'b';
@@ -285 +285 @@
                 std::list<SString> tokenized = tokenizeSequence(line);
                 std::list<SString>::iterator it = tokenized.begin();
-                int rndid = randomN(tokenized.size()); // select random insertion point
+                int rndid = rndUint(tokenized.size()); // select random insertion point
                 std::advance(it, rndid);
                 NeuroClass *cls = getRandomNeuroClass();
@@ -306 +306 @@
                 chg = 1.0 / line.len();
                 std::list<SString> tokenized = tokenizeSequence(line);
-                int rndid = randomN(tokenized.size()); // select random insertion point
+                int rndid = rndUint(tokenized.size()); // select random insertion point
                 std::list<SString>::iterator it = tokenized.begin();
                 std::advance(it, rndid);
                 SString letter = "a";
-                letter.directWrite()[0] = 'a' + randomN(26);
+                letter.directWrite()[0] = 'a' + rndUint(26);
                 tokenized.insert(it, letter);
                 line = detokenizeSequence(&tokenized);
@@ -320 +320 @@
                 std::list<SString> tokenized = tokenizeSequence(line);
                 std::list<SString>::iterator it = tokenized.begin();
-                int rndid = randomN(tokenized.size()); // select random deletion point
+                int rndid = rndUint(tokenized.size()); // select random deletion point
                 std::advance(it, rndid);
                 tokenized.erase(it);
@@ -328 +328 @@
         case FB_DUPLICATION:
         {
-                int rndgene = randomN(fB_GenoHelpers::geneCount(line));
+                int rndgene = rndUint(fB_GenoHelpers::geneCount(line));
                 int start, end;
                 SString gene = fB_GenoHelpers::getGene(rndgene, line, start, end);
@@ -342 +342 @@
                 for (int i = 0; i < 4; i++)
                 {
-                        cuts[i] = randomN(tokenized.size());
+                        cuts[i] = rndUint(tokenized.size());
                 }
                 std::sort(cuts.begin(), cuts.end());
@@ -407 +407 @@
         {
                 // get random gene from first parent
-                int choice = randomN(fB_GenoHelpers::geneCount(parent1));
+                int choice = rndUint(fB_GenoHelpers::geneCount(parent1));
                 int start, end;
                 SString gene = fB_GenoHelpers::getGene(choice, parent1, start, end);
@@ -414 +414 @@
                 chg2 = (float)parent2.len() / (float)child2.len();
                 // do the same for second parent
-                choice = randomN(fB_GenoHelpers::geneCount(parent2));
+                choice = rndUint(fB_GenoHelpers::geneCount(parent2));
                 gene = fB_GenoHelpers::getGene(choice, parent2, start, end);
                 child1 = gene + parent1;
@@ -428 +428 @@
         //                      int start, end;
         //                      SString gene = fB_GenoHelpers::getGene(i, parent1, start, end);
-        //                      if (randomN(2) == 0)
+        //                      if (rndUint(2) == 0)
         //                      {
         //                              child1 += gene;
@@ -445 +445 @@
         //                      int start, end;
         //                      SString gene = fB_GenoHelpers::getGene(i, parent2, start, end);
-        //                      if (randomN(2) == 0)
+        //                      if (rndUint(2) == 0)
         //                      {
         //                              child1 += gene;
@@ -474 +474 @@
                                 i < fB_GenoHelpers::geneCountNoNested(parent2))
                         {
-                                if (randomN(2) == 0)
+                                if (rndUint(2) == 0)
                                 {
                                         to1 = fB_GenoHelpers::getNonNestedGene(i, parent1, start, end);
@@ -489 +489 @@
                         else if (i < fB_GenoHelpers::geneCountNoNested(parent1))
                         {
-                                if (randomN(2) == 0)
+                                if (rndUint(2) == 0)
                                 {
                                         to1 = fB_GenoHelpers::getNonNestedGene(i, parent1, start, end);
@@ -501 +501 @@
                         else // if (i < fB_GenoHelpers::geneCountNoNested(parent2))
                         {
-                                if (randomN(2) == 0)
+                                if (rndUint(2) == 0)
                                 {
                                         to1 = fB_GenoHelpers::getNonNestedGene(i, parent2, start, end);