Changeset 803 for cpp/frams/genetics

Timestamp:

06/07/18 17:42:49 (6 years ago)

Author:

Maciej Komosinski

Message:

Performance improvements, including avoiding unnecessary passing of objects by value

Location:

cpp/frams/genetics

Files:

• fH/fH_general.cpp (modified) (1 diff)
• fH/fH_general.h (modified) (1 diff)
• fH/fH_oper.cpp (modified) (2 diffs)
• fL/fL_general.cpp (modified) (7 diffs)
• fL/fL_general.h (modified) (7 diffs)
• fL/fL_oper.cpp (modified) (2 diffs)

cpp/frams/genetics/fH/fH_general.cpp

@@ -189 +189 @@
 }
 
-int fH_Builder::parseGenotype(SString genotype)
+int fH_Builder::parseGenotype(const SString &genotype)
 {
         // Firstly, number of dimensions is parsed

cpp/frams/genetics/fH/fH_general.h

@@ -408 +408 @@
          * @return 0 if processing was successful, 1 if parsing of dimensions went wrong or one of genotype lines could not be parsed
          */
-        int parseGenotype(SString genotype);
+        int parseGenotype(const SString &genotype);
 
         /**

cpp/frams/genetics/fH/fH_oper.cpp

@@ -255 +255 @@
                 fH_Handle *handle = NULL;
                 method = FH_OPCOUNT + roulette(addoperations, FH_ADD_OPCOUNT);
+                if (getActiveNeuroClassCount() == 0) method = FH_OPCOUNT + FH_ADD_STICK;
                 switch (method - FH_OPCOUNT)
                 {
@@ -466 +467 @@
         {
                 nc = getRandomNeuroClass();
-                if (!nc) nc = Neuro::getClass("N");
+                // checking of neuron class availability should be checked before
         }
 

cpp/frams/genetics/fL/fL_general.cpp

@@ -73 +73 @@
 }
 
-bool fL_Builder::getNextObject(int &pos, SString src, SString &token)
+bool fL_Builder::getNextObject(int &pos, const SString &src, SString &token)
 {
         // if position exceeds length then return false
@@ -130 +130 @@
 }
 
-std::string fL_Builder::trimSpaces(std::string data)
+std::string fL_Builder::trimSpaces(const std::string& data)
 {
         size_t first = data.find_first_not_of(' ');
@@ -141 +141 @@
 }
 
-int fL_Builder::createWord(SString token, fL_Word *&word, int numparams, int begin, int end)
+int fL_Builder::createWord(const SString &token, fL_Word *&word, int numparams, int begin, int end)
 {
         SString wordn;
@@ -229 +229 @@
 }
 
-int fL_Builder::tokenize(SString sequence, std::list<fL_Word *> &result, int numparams, int begin, int end)
+int fL_Builder::tokenize(const SString &sequence, std::list<fL_Word *> &result, int numparams, int begin, int end)
 {
         int pos = 0;
@@ -450 +450 @@
 }
 
-int fL_Builder::processLine(fLElementType type, SString line, fL_Element *&obj, int linenumber, int begin, int end)
+int fL_Builder::processLine(fLElementType type, const SString &line, fL_Element *&obj, int linenumber, int begin, int end)
 {
         ParamEntry *tab;
@@ -557 +557 @@
 }
 
-int fL_Builder::parseGenotype(SString genotype)
+int fL_Builder::parseGenotype(const SString &genotype)
 {
         int pos = 0;
@@ -1303 +1303 @@
                         m->checkpoint();
                 }
-                if (maxwords != -1 && genotype.size() > (unsigned int)maxwords)
+                if (maxwords != -1 && ((int)genotype.size()) > maxwords)
                 {
                         wordsexceeded = true;

cpp/frams/genetics/fL/fL_general.h

@@ -315 +315 @@
          * @return string with trimmed spaces
          */
-        static std::string trimSpaces(std::string data);
+        static std::string trimSpaces(const std::string& data);
 
         /**
@@ -328 +328 @@
          * @return 0 if processing ended successfully, 1-based position of error otherwise
          */
-        int processLine(fLElementType type, SString line, fL_Element *&obj, int linenumber, int begin, int end);
+        int processLine(fLElementType type, const SString &line, fL_Element *&obj, int linenumber, int begin, int end);
 
         /**
@@ -343 +343 @@
          * @return 0 if processing finished successfully, 1-based position of error if it occured
          */
-        int parseGenotype(SString genotype);
+        int parseGenotype(const SString &genotype);
 
         /**
@@ -365 +365 @@
          * @return true if new token is found, false if there is no more tokens or when there was parenthesis mismatch (if pos == -1, then it is parenthesis mismatch)
          */
-        bool getNextObject(int &pos, SString src, SString &token);
+        bool getNextObject(int &pos, const SString &src, SString &token);
 
         /**
@@ -376 +376 @@
          * @return 0 if conversion went successfully, 1 when there is a problem with parsing
          */
-        int createWord(SString worddef, fL_Word *&word, int numparams, int begin, int end);
+        int createWord(const SString &worddef, fL_Word *&word, int numparams, int begin, int end);
 
         /**
@@ -385 +385 @@
          * @return 0 if tokenizing finished successfully, 1 otherwise
          */
-        int tokenize(SString sequence, std::list<fL_Word *> &result, int numparams, int begin, int end);
+        int tokenize(const SString &sequence, std::list<fL_Word *> &result, int numparams, int begin, int end);
 
         /**
@@ -452 +452 @@
          * @return pointer to the input neuron, or NULL if no neuron could be found
          */
-        Neuro *findInputNeuron(std::pair<std::list<fL_Word *>::iterator, Neuro *> currneu, fL_Word *attractor);
+        Neuro* findInputNeuron(std::pair<std::list<fL_Word *>::iterator, Neuro *> currneu, fL_Word *attractor);
 
         /**

cpp/frams/genetics/fL/fL_oper.cpp

@@ -142 +142 @@
                         SString det;
                         NeuroClass *cls = getRandomNeuroClass();
-                        if (!cls) cls = Neuro::getClass("N");
+                        //we do not check if this class
                         det = cls->getName();
                         Geno_fH::mutateNeuronProperties(det);
@@ -202 +202 @@
                         return creature->words["S"];
                 case FL_ADD_NEURO:
-                        return creature->words["N"];
+                        if (getActiveNeuroClassCount() == 0)
+                                return creature->words["S"];
+                        else
+                                return creature->words["N"];
                 case FL_ADD_CONN:
                         return creature->words["C"];