Changeset 803 for cpp/frams/genetics/fL/fL_general.cpp

Timestamp:

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

Author:

Maciej Komosinski

Message:

Performance improvements, including avoiding unnecessary passing of objects by value

File:

• cpp/frams/genetics/fL/fL_general.cpp (modified) (7 diffs)

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;