Changeset 348 for cpp/frams/model

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/model

Files:

• autoname.cpp (modified) (1 diff)
• model.cpp (modified) (10 diffs)

cpp/frams/model/autoname.cpp

@@ -38 +38 @@
         unsigned int s1 = 0, s2 = 0, s3 = 0;
         SString g = model.getGeno().getGene();
-        const char *x = g;
+        const char *x = g.c_str();
         for (; *x; x++) { s1 += *x; s2 = s2**x + *x; s3 = (s3^*x) + *x; }
         char* t = buf;

cpp/frams/model/model.cpp

@@ -331 +331 @@
                 FMprintf("Model","build",FMLV_ERROR,
                          geno.getName().len()?"illegal f0 code at line %d (%s)":"illegal f0 code at line %d",
-                         lnum,(const char*)geno.getName());
+                         lnum,geno.getName().c_str());
                 f0errorposition=lastpos;
                 if (convmap) delete convmap;
@@ -473 +473 @@
                 }
         }
-g=Geno(gen,'0');
+g=Geno(gen.c_str(),'0');
 }
 
@@ -559 +559 @@
 int Model::singleStepBuild(const SString &line,const MultiRange* srcrange)
 {
-int pos=0; const char*t=(const char*)line;
+int pos=0; const char*t=line.c_str();
 for (;*t;t++,pos++)
         if (!strchr(" \r\t",*t)) break;
@@ -943 +943 @@
                                 FMprintf("Model","internalCheck",FMLV_ERROR,
                                          "delta joint cycle detected at joint#%d (%s)",
-                                         i,(const char*)geno.getName());
+                                         i,geno.getName().c_str());
                                 }
                         j->resetDeltaMarkers();
@@ -979 +979 @@
                         ret=0;
                         FMprintf("Model","internalCheck",FMLV_ERROR,"delta too big in joint #%d (%s)",
-                                 i,(const char*)geno.getName());
+                                 i,geno.getName().c_str());
                         }
                         else if (j->d()<getMinJoint().d.x)
@@ -985 +985 @@
                         ret=0;
                         FMprintf("Model","internalCheck",FMLV_ERROR,"delta too small in joint #%d (%s)",
-                                 i,(const char*)geno.getName());
+                                 i,geno.getName().c_str());
                         }
                                 }
@@ -993 +993 @@
                 {
                 FMprintf("Model","internalCheck",FMLV_ERROR,"illegal part references in joint #%d (%s)",
-                         i,(const char*)geno.getName());
+                         i,geno.getName().c_str());
                 ret=0;
                 }
@@ -1072 +1072 @@
                         {
                         FMprintf("Model","internalCheck",FMLV_ERROR,"not all parts connected (eg.#0-#%d) (%s)",
-                                 i,(const char*)geno.getName());
+                                 i,geno.getName().c_str());
                         ret=0;
                         break;
@@ -1085 +1085 @@
                 {
                 FMprintf("Model","internalCheck",FMLV_ERROR,"illegal self connection, joint #%d (%s)",
-                         i,(const char*)geno.getName());
+                         i,geno.getName().c_str());
                 ret=0;
                 break;
@@ -1096 +1096 @@
                         {
                         FMprintf("Model","internalCheck",FMLV_ERROR,"illegal duplicate joints #%d and #%d (%s)",
-                                 i,k,(const char*)geno.getName());
+                                 i,k,geno.getName().c_str());
                         ret=0;
                         break;