Changeset 348 for cpp/frams/_demos/geometry

Timestamp:

04/09/15 23:51:28 (10 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/_demos/geometry

Files:

• apices_test.cpp (modified) (1 diff)
• geometrytestutils.cpp (modified) (5 diffs)
• info_test.cpp (modified) (1 diff)
• surface_test.cpp (modified) (1 diff)
• volume_test.cpp (modified) (1 diff)

cpp/frams/_demos/geometry/apices_test.cpp

@@ -47 +47 @@
         // Finishing result Model and printing its genotype.
         resultModel.close();
-        puts((const char*)resultModel.getF0Geno().toString());
+        puts(resultModel.getF0Geno().toString().c_str());
 }
 

cpp/frams/_demos/geometry/geometrytestutils.cpp

@@ -25 +25 @@
                 
                 fprintf(stderr, "%d. (%6d chars) %s\n", count, genotype->genotype.len(),
-                        (const char*)genotype->name);
+                        genotype->name.c_str());
         }
         
         if (loader.getStatus() == MiniGenotypeLoader::OnError)
         {
-                fprintf(stderr, "Error: %s\n", (const char*)loader.getError());
+                fprintf(stderr, "Error: %s\n", loader.getError().c_str());
                 return 2;
         }
@@ -58 +58 @@
                 count++;
                 
-                if ((genoIndex == count) || (strcmp((const char*)genotype->name, genoName) == 0))
+                if ((genoIndex == count) || (strcmp(genotype->name.c_str(), genoName) == 0))
                 {
                         Model model(genotype->genotype);
@@ -75 +75 @@
         if (loader.getStatus() == MiniGenotypeLoader::OnError)
         {
-                fprintf(stderr, "Error: %s\n", (const char*)loader.getError());
+                fprintf(stderr, "Error: %s\n", loader.getError().c_str());
                 return 2;
         }
@@ -156 +156 @@
                 "GENO_ID - either genotype name or index (1-based)\n"
                 "SHAPE - 1=ellipsoid, 2=cuboid, 3=cylinder, others or none=random\n",
-                (const char*)header);
+                header.c_str());
         return 1;
 }
@@ -220 +220 @@
                 "DENSITY - minimal number of samples per unit\n"
                 "SHAPE - 1=ellipsoid, 2=cuboid, 3=cylinder, others or none=random\n",
-                (const char*)header);
+                header.c_str());
         return 1;
 }

cpp/frams/_demos/geometry/info_test.cpp

@@ -72 +72 @@
         // Finishing result Model and printing its genotype.
         resultModel.close();
-        puts((const char*)resultModel.getF0Geno().toString());
+        puts(resultModel.getF0Geno().toString().c_str());
         
         // Printing calculated values.

cpp/frams/_demos/geometry/surface_test.cpp

@@ -47 +47 @@
         // Finishing result Model and printing its genotype.
         resultModel.close();
-        puts((const char*)resultModel.getF0Geno().toString());
+        puts(resultModel.getF0Geno().toString().c_str());
 }
 

cpp/frams/_demos/geometry/volume_test.cpp

@@ -39 +39 @@
         // Finishing result Model and printing its genotype.
         resultModel.close();
-        puts((const char*)resultModel.getF0Geno().toString());
+        puts(resultModel.getF0Geno().toString().c_str());
 }