Changeset 973 for cpp/frams/genetics/fB

Timestamp:

07/03/20 00:37:13 (4 years ago)

Author:

Maciej Komosinski

Message:

Increased SString and std::string compatibility: introduced length(), size(), and capacity(), and removed legacy methods that have std::string equivalents

Location:

cpp/frams/genetics/fB

Files:

• fB_conv.cpp (modified) (4 diffs)
• fB_general.h (modified) (5 diffs)
• fB_oper.cpp (modified) (16 diffs)

cpp/frams/genetics/fB/fB_conv.cpp

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2018  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2020  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -80 +80 @@
                 int endoffset = 0;
                 if (gene.indexOf("zz", 0) != -1) endoffset = 2;
-                if (gene.len() - endoffset < 3)
+                if (gene.length() - endoffset < 3)
                 {
                         fH_StickHandle *handle = new fH_StickHandle(dims, start, end);
@@ -124 +124 @@
                 if (gene.indexOf("zz", 0) != -1) endoffset = 2;
                 int nclassdefcount = 1;
-                while (z < gene.len() - endoffset)
+                while (z < gene.length() - endoffset)
                 {
                         if (processNextLetter(creature, handle, par, gene, propindex, z, ranges, nclassdefcount) == -1)
@@ -185 +185 @@
                         }
                         nextid++;
-                }
-                while (genotype[nextid] == '"');
+                } while (genotype[nextid] == '"');
                 i = nextid;
         }

cpp/frams/genetics/fB/fB_general.h

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2018  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2020  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -35 +35 @@
                 do {
                         count++;
-                        if (start < genotype.len())
+                        if (start < genotype.length())
                                 result = getNextGene(start, genotype, tmp, start);
                         else
@@ -52 +52 @@
                 do {
                         count++;
-                        if (start < geno.len())
+                        if (start < geno.length())
                                 getNextGene(start, geno, tmp, start);
                         else
@@ -89 +89 @@
                 } while (quotecount % 2 != 0 && end != -1);
 
-                if (end == -1) end = genotype.len();
+                if (end == -1) end = genotype.length();
                 else end += 2;
                 start -= 1;
@@ -124 +124 @@
                 } while (quotecount % 2 != 0 && end != -1);
 
-                if (end == -1) end = genotype.len();
+                if (end == -1) end = genotype.length();
                 else end += 2;
                 start -= 1;

cpp/frams/genetics/fB/fB_oper.cpp

@@ -47 +47 @@
                 int endoffset = 0;
                 if (gene.indexOf("zz", 0) != -1) endoffset = 2;
-                if (gene.len() - endoffset < 3)
+                if (gene.length() - endoffset < 3)
                 {
                         return true; // genes with length < 3 are always sticks
@@ -83 +83 @@
         }
         // check if rest of characters are lowercase
-        for (int i = genstart; i < genotype.len(); i++)
+        for (int i = genstart; i < genotype.length(); i++)
         {
                 if (!islower(genotype[i]))
@@ -144 +144 @@
                 fix = true;
         }
-        for (int i = pos; i < genotype.len(); i++)
+        for (int i = pos; i < genotype.length(); i++)
         {
                 // if character is not alphabetic - error
@@ -208 +208 @@
         std::list<SString> res;
         int i = 0;
-        while (i < genotype.len())
+        while (i < genotype.length())
         {
                 // if character is not alphabetic - error
@@ -252 +252 @@
                 std::advance(it, rndid);
                 SString t = (*it);
-                if ((*it).len() == 1)
+                if ((*it).length() == 1)
                 {
                         if (rndUint(2) == 0)
@@ -264 +264 @@
                                 else (*it).directWrite()[0] = (*it)[0] + 1;
                         }
-                        chg = 1.0 / line.len();
+                        chg = 1.0 / line.length();
                 }
                 else
@@ -270 +270 @@
                         // first method needs to extract quotes
                         SString def = (*it);
-                        def = def.substr(1, def.len() - 2);
+                        def = def.substr(1, def.length() - 2);
                         Geno_fH::mutateNeuronProperties(def);
                         SString res = "\"";
@@ -276 +276 @@
                         res += "\"";
                         (*it) = res;
-                        chg = (double)def.len() / line.len();
+                        chg = (double)def.length() / line.length();
                 }
                 line = detokenizeSequence(&tokenized);
@@ -296 +296 @@
                         res += "\"";
                         tokenized.insert(it, res);
-                        chg = (double)classdef.len() / line.len();
+                        chg = (double)classdef.length() / line.length();
                         line = detokenizeSequence(&tokenized);
                         break;
@@ -304 +304 @@
         case FB_INSERTION:
         {
-                chg = 1.0 / line.len();
+                chg = 1.0 / line.length();
                 std::list<SString> tokenized = tokenizeSequence(line);
                 int rndid = rndUint(tokenized.size()); // select random insertion point
@@ -317 +317 @@
         case FB_DELETION:
         {
-                chg = 1.0 / line.len();
+                chg = 1.0 / line.length();
                 std::list<SString> tokenized = tokenizeSequence(line);
                 std::list<SString>::iterator it = tokenized.begin();
@@ -332 +332 @@
                 SString gene = fB_GenoHelpers::getGene(rndgene, line, start, end);
                 if (gene.indexOf("zz", 0) == -1) gene += "zz";
-                chg = (float)gene.len() / line.len();
+                chg = (float)gene.length() / line.length();
                 line = gene + line;
                 break;
@@ -364 +364 @@
                 //                      line.substr(cuts[1], cuts[2] - cuts[1]) + first + line.substr(cuts[3]);
                 line = detokenizeSequence(&res);
-                chg = (float)(cuts[3] - cuts[2] + cuts[1] - cuts[0]) / line.len();
+                chg = (float)(cuts[3] - cuts[2] + cuts[1] - cuts[0]) / line.length();
                 break;
         }
@@ -412 +412 @@
                 // add this gene to the beginning of the second parent genotype
                 child2 = gene + parent2;
-                chg2 = (float)parent2.len() / (float)child2.len();
+                chg2 = (float)parent2.length() / (float)child2.length();
                 // do the same for second parent
                 choice = rndUint(fB_GenoHelpers::geneCount(parent2));
                 gene = fB_GenoHelpers::getGene(choice, parent2, start, end);
                 child1 = gene + parent1;
-                chg1 = (float)parent1.len() / (float)child1.len();
+                chg1 = (float)parent1.length() / (float)child1.length();
                 break;
         }
@@ -523 +523 @@
         free(g1);
         free(g2);
-        if (child1.len() > 0 && child2.len() == 0)
+        if (child1.length() > 0 && child2.length() == 0)
         {
                 child1 = strdims + "\n" + child1;
@@ -529 +529 @@
                 g2 = strdup("");
         }
-        else if (child2.len() > 0 && child1.len() == 0)
+        else if (child2.length() > 0 && child1.length() == 0)
         {
                 child2 = strdims + "\n" + child2;