Changeset 821 for cpp/frams/genetics/fL

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/fL

Files:

• fL_general.cpp (modified) (2 diffs)
• fL_general.h (modified) (1 diff)
• fL_matheval.cpp (modified) (1 diff)
• fL_oper.cpp (modified) (4 diffs)

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));