Changeset 973 for cpp/frams/neuro

Timestamp:

07/03/20 00:37:13 (4 years ago)

Author:

Maciej Komosinski

Message:

Increased SString and std::string compatibility: introduced length(), size(), and capacity(), and removed legacy methods that have std::string equivalents

Location:

cpp/frams/neuro

Files:

• impl/neuroimpl-fuzzy-f0.cpp (modified) (2 diffs)
• impl/neuroimpl-fuzzy.cpp (modified) (2 diffs)
• neurofactory.cpp (modified) (1 diff)
• neurolibparam.cpp (modified) (2 diffs)

cpp/frams/neuro/impl/neuroimpl-fuzzy-f0.cpp

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2015  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2020  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -83 +83 @@
 int FuzzyF0String::convertStrToRules(const SString& str, const int ruledef[], int **rules, int setsNr, int rulesNr, int &maxOutputNr)
 {
-        int pos = 0, j, k, len = str.len();
+        int pos = 0, j, k, len = str.length();
         int dNr = 0, sNr = 0;
         int inNr, outNr; //number of inputs/outputs and corresponding fuzzy sets

cpp/frams/neuro/impl/neuroimpl-fuzzy.cpp

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2015  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2020  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -21 +21 @@
 
         //check correctness of given parameters: string must not be null, sets&rules number > 0
-        if ((fuzzySetsNr < 1) || (rulesNr < 1) || (fuzzySetString.len() == 0) || (fuzzyRulesString.len() == 0))
+        if ((fuzzySetsNr < 1) || (rulesNr < 1) || (fuzzySetString.length() == 0) || (fuzzyRulesString.length() == 0))
                 return 0; //error
 

cpp/frams/neuro/neurofactory.cpp

@@ -103 +103 @@
                 }
         }
-        if (removed.len())
+        if (removed.length())
                 logPrintf("NeuroFactory", "removeUninmplemented", LOG_INFO,
                         "Removed Neuro classes: %s", removed.c_str());

cpp/frams/neuro/neurolibparam.cpp

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2015  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2020  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -33 +33 @@
 static bool isGoodName(const SString& name)
 {
-        for (int i = 0; i < name.len(); i++)
+        for (int i = 0; i < name.length(); i++)
                 if (!isalnum(name[i])) return false;
         return true;