Changeset 348 for cpp/frams/neuro

Timestamp:

04/09/15 23:51:28 (9 years ago)

Author:

Maciej Komosinski

Message:

• explicit c_str() in SString instead of (const char*) cast
• genetic converters and GenMan? are now thread-local which enables multi-threaded simulator separation

Location:

cpp/frams/neuro

Files:

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

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

@@ -23 +23 @@
       break;
     else
-      numbers[have++]=atof(t);
+      numbers[have++]=atof(t.c_str());
 
   //check if number of read numbers (separated with semicolon) is equal to declared
@@ -122 +122 @@
         t += str.charAt(pos++);
       pos++;
-      rules[j][k]=atol(t); //convert cut out string into number
+      rules[j][k]=atol(t.c_str()); //convert cut out string into number
       //fuzzy sets - odd index table - are counted from 0,
       //so if 5 fuzzy sets declared, values acceptable are 0,1,2,3,4

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

@@ -35 +35 @@
   rulesDef = new int[2*rulesNr];    //for each rule remembers number of inputs and outputs
   //check correctness of string and fill in the rulesDef
-  if (FuzzyF0String::countInputsOutputs(fuzzyRulesString, rulesDef, rulesNr) == 0)
+  if (FuzzyF0String::countInputsOutputs(fuzzyRulesString.c_str(), rulesDef, rulesNr) == 0)
   {
     defuzzParam = new double[rulesNr]; // parameters used in defuzyfication process

cpp/frams/neuro/neurofactory.cpp

@@ -99 +99 @@
 if (removed.len())
         FMprintf("NeuroFactory","removeUninmplemented",FMLV_INFO,
-         "Removed Neuro classes: %s",(const char*)removed);
+         "Removed Neuro classes: %s",removed.c_str());
 }
 

cpp/frams/neuro/neuroimpl.cpp

@@ -73 +73 @@
         if (!ni) { errorcount++;
                 FMprintf("NeuroNetImpl","create",FMLV_WARN,"neuron #%d (%s) implementation not available",
-                         i,(const char*)n->getClassName());
+                         i,n->getClassName().c_str());
                 continue; } // implementation not available?!
         ni->owner=this;
@@ -88 +88 @@
                 { ni->status=NeuroImpl::InitError; errorcount++;
                 FMprintf("NeuroNetImpl","create",FMLV_WARN,"neuron #%d (%s) initialization failed",
-                         i,(const char*)n->getClassName());
+                         i,n->getClassName().c_str());
                 continue; }
         ni->status=NeuroImpl::InitOk;

cpp/frams/neuro/neurolibparam.cpp

@@ -51 +51 @@
         t+=n;
         }
-return t;
+return t.c_str();
 }
 
@@ -59 +59 @@
 t=Neuro::getClass(i)->getLongName();
 t+=" ("; t+=Neuro::getClassName(i); t+=")";
-return t;
+return t.c_str();
 }
 
@@ -66 +66 @@
 static SString t;
 t=Neuro::getClass(i)->getSummary();
-return t;
+return t.c_str();
 }