Changeset 348 for cpp/frams/genetics/f1

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

File:

• cpp/frams/genetics/f1/conv_f1.cpp (modified) (3 diffs)

cpp/frams/genetics/f1/conv_f1.cpp

@@ -102 +102 @@
 SString GenoConv_f1::convert(SString &i,MultiMap *map)
 {
-const char* g=(const char*)i;
+const char* g=i.c_str();
 Builder builder(g,map?1:0);
 builder.model.open();
@@ -403 +403 @@
                                         lastNeuroClassParam();
                                         //special handling: muscle properties (can be overwritten by subsequent property assignments)
-                                        if (!strcmp(cls->getName(),"|"))
+                                        if (!strcmp(cls->getName().c_str(),"|"))
                                                 {
                                                 neuro_cls_param->setDoubleById("p",lastjoint_muscle_power);
                                                 neuro_cls_param->setDoubleById("r",props.bendrange);
                                                 }
-                                        else if (!strcmp(cls->getName(),"@"))
+                                        else if (!strcmp(cls->getName().c_str(),"@"))
                                                 {
                                                 neuro_cls_param->setDoubleById("p",lastjoint_muscle_power);
@@ -485 +485 @@
         SString name(begin,colon-begin);
         SString value(colon+1,end-(colon+1));
-        addClassParam(name,value);
-        }
-}
+        addClassParam(name.c_str(),value.c_str());
+        }
+}