Changeset 821 for cpp/frams/genetics/fB

Timestamp:

10/10/18 01:13:05 (6 years ago)

Author:

Maciej Komosinski

Message:

Performance and stability improvements in fB, fH, and fL; improved parsing and math evaluations in fL

Location:

cpp/frams/genetics/fB

Files:

• fB_conv.cpp (modified) (1 diff)
• fB_oper.cpp (modified) (8 diffs)
• fB_oper.h (modified) (1 diff)

cpp/frams/genetics/fB/fB_conv.cpp

@@ -163 +163 @@
                                 fHgenotype.getNextToken(fHpos, line, '\n');
                                 map->add(ranges[t][q].begin, ranges[t][q].end, lastpos, fHpos - 1);
+                                lastpos = fHpos;
                         }
                 }

cpp/frams/genetics/fB/fB_oper.cpp

@@ -39 +39 @@
 }
 
-bool Geno_fB::hasStick(SString genotype)
+bool Geno_fB::hasStick(const SString &genotype)
 {
         for (int i = 0; i < fB_GenoHelpers::geneCount(genotype); i++)
@@ -194 +194 @@
 }
 
-SString Geno_fB::detokenizeSequence(std::list<SString> tokenlist)
+SString Geno_fB::detokenizeSequence(std::list<SString> *tokenlist)
 {
         SString res = "";
-        for (std::list<SString>::iterator it = tokenlist.begin(); it != tokenlist.end(); it++)
+        for (std::list<SString>::iterator it = tokenlist->begin(); it != tokenlist->end(); it++)
         {
                 res += (*it);
@@ -204 +204 @@
 }
 
-std::list<SString> Geno_fB::tokenizeSequence(SString genotype)
+std::list<SString> Geno_fB::tokenizeSequence(const SString &genotype)
 {
         std::list<SString> res;
@@ -278 +278 @@
                         chg = (double)def.len() / line.len();
                 }
-                line = detokenizeSequence(tokenized);
+                line = detokenizeSequence(&tokenized);
                 break;
         }
@@ -297 +297 @@
                         tokenized.insert(it, res);
                         chg = (double)classdef.len() / line.len();
-                        line = detokenizeSequence(tokenized);
+                        line = detokenizeSequence(&tokenized);
                         break;
                 }
@@ -312 +312 @@
                 letter.directWrite()[0] = 'a' + randomN(26);
                 tokenized.insert(it, letter);
-                line = detokenizeSequence(tokenized);
+                line = detokenizeSequence(&tokenized);
                 break;
         }
@@ -323 +323 @@
                 std::advance(it, rndid);
                 tokenized.erase(it);
-                line = detokenizeSequence(tokenized);
+                line = detokenizeSequence(&tokenized);
                 break;
         }
@@ -363 +363 @@
 //              SString result = line.substr(0, cuts[0]) + second +
 //                      line.substr(cuts[1], cuts[2] - cuts[1]) + first + line.substr(cuts[3]);
-                line = detokenizeSequence(res);
+                line = detokenizeSequence(&res);
                 chg = (float)(cuts[3] - cuts[2] + cuts[1] - cuts[0]) / line.len();
                 break;

cpp/frams/genetics/fB/fB_oper.h

@@ -30 +30 @@
 {
 private:
-        bool hasStick(SString genotype);
-        SString detokenizeSequence(std::list<SString> tokenlist);
-        std::list<SString> tokenizeSequence(SString genotype);
+        bool hasStick(const SString &genotype);
+        SString detokenizeSequence(std::list<SString> *tokenlist);
+        std::list<SString> tokenizeSequence(const SString &genotype);
 
 public: