Changeset 821

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

Files:

• fB/fB_conv.cpp (modified) (1 diff)
• fB/fB_oper.cpp (modified) (8 diffs)
• fB/fB_oper.h (modified) (1 diff)
• fH/fH_general.cpp (modified) (4 diffs)
• fH/fH_general.h (modified) (1 diff)
• fL/fL_general.cpp (modified) (2 diffs)
• fL/fL_general.h (modified) (1 diff)
• fL/fL_matheval.cpp (modified) (1 diff)
• fL/fL_oper.cpp (modified) (4 diffs)

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:

cpp/frams/genetics/fH/fH_general.cpp

@@ -344 +344 @@
 // Creature build functions
 
-Part * fH_StickHandle::createPart(ParamEntry *tab, std::vector<fH_StickHandle *> children, Model *model, bool createmapping)
+Part * fH_StickHandle::createPart(ParamEntry *tab, std::vector<fH_StickHandle *> *children, Model *model, bool createmapping)
 {
         Param par(tab, obj);
@@ -353 +353 @@
         }
 
-        unsigned int stickscount = children.size() + 1;
+        unsigned int stickscount = children->size() + 1;
 
         MultiRange ranges;
         ranges.add(begin, end);
 
-        for (fH_StickHandle *child : children)
+        for (fH_StickHandle *child : (*children))
         {
                 par.select(child->obj);
@@ -753 +753 @@
                 {
                         vector<fH_StickHandle *> emptylist;
-                        Part *firstpart = currstick->createPart(stickparamtab, emptylist, model, createmapping);
+                        Part *firstpart = currstick->createPart(stickparamtab, &emptylist, model, createmapping);
                         firstpart->p = Pt3D(0);
                         currstick->firstpart = firstpart;
@@ -847 +847 @@
                 }
                 // create part from current stick and other sticks connected to this part
-                Part *secondpart = currstick->createPart(stickparamtab, children, model, createmapping);
+                Part *secondpart = currstick->createPart(stickparamtab, &children, model, createmapping);
                 secondpart->p = secondposition;
                 currstick->secondpart = secondpart;

cpp/frams/genetics/fH/fH_general.h

@@ -173 +173 @@
          * @return created part
          */
-        Part *createPart(ParamEntry *tab, std::vector<fH_StickHandle *> children, Model *model, bool createmapping);
+        Part *createPart(ParamEntry *tab, std::vector<fH_StickHandle *> *children, Model *model, bool createmapping);
 
         /**

cpp/frams/genetics/fL/fL_general.cpp

@@ -488 +488 @@
                 std::string message = "Error in parsing parameters at line:  " + std::to_string(linenumber);
                 logMessage("fL_Builder", "processLine", LOG_ERROR, message.c_str());
-                delete obj;
+                if (obj != this) delete obj;
                 return begin + 1;
         }
@@ -1339 +1339 @@
 }
 
-int fL_Builder::countSticksInSequence(std::list<fL_Word *> sequence)
+int fL_Builder::countSticksInSequence(std::list<fL_Word *> *sequence)
 {
         int count = 0;
-        for (std::list<fL_Word *>::iterator it = sequence.begin(); it != sequence.end(); it++)
+        for (std::list<fL_Word *>::iterator it = sequence->begin(); it != sequence->end(); it++)
         {
                 if ((*it)->builtin && (*it)->name == "S")

cpp/frams/genetics/fL/fL_general.h

@@ -482 +482 @@
          * @return number of sticks in sequence
          */
-        int countSticksInSequence(std::list<fL_Word *> sequence);
+        int countSticksInSequence(std::list<fL_Word *> *sequence);
 
         /**

cpp/frams/genetics/fL/fL_matheval.cpp

@@ -116 +116 @@
         registerOperator(meqless, 1, Associativity::LEFT, "<=");
         registerOperator(mequal, 1, Associativity::RIGHT, "=");
-        registerOperator(mnotequal, 1, Associativity::RIGHT, "~");
+        registerOperator(mnotequal, 1, Associativity::RIGHT, "<>");
         registerOperator(mand, 0, Associativity::LEFT, "&");
         registerOperator(mor, 0, Associativity::LEFT, "|");

cpp/frams/genetics/fL/fL_oper.cpp

@@ -64 +64 @@
         }
 
-        if (builder.countSticksInSequence(builder.genotype) == 0)
+        if (builder.countSticksInSequence(&builder.genotype) == 0)
         {
                 return GENOPER_OPFAIL;
@@ -142 +142 @@
                         SString det;
                         NeuroClass *cls = getRandomNeuroClass();
-                        //we do not check if this class
                         det = cls->getName();
                         Geno_fH::mutateNeuronProperties(det);
@@ -418 +417 @@
                         int ruleid = 0;
                         std::list<fL_Word *> *list = selectRandomSequence(creature, numpars, ruleid);
-                        if (ruleid == -1 && creature->countSticksInSequence((*list)) == 1)
+                        if (ruleid == -1 && creature->countSticksInSequence(list) == 1)
                         {
                                 if (list->size() > 1)
@@ -540 +539 @@
                         }
                         int chgtype = roulette(chgoperations, FL_CHG_COUNT);
-                        if (creature->countSticksInSequence((*list)) == 1 && tmp == -1) // if sequence is axiom
+                        if (creature->countSticksInSequence(list) == 1 && tmp == -1) // if sequence is axiom
                         {
                                 fL_Word *worddef = randomWordDefinition(creature, roulette(addtypes, FL_ADD_COUNT - 1));