Changeset 348 for cpp/frams/_demos/f0_variants_test.cpp

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

File:

• cpp/frams/_demos/f0_variants_test.cpp (modified) (3 diffs)

cpp/frams/_demos/f0_variants_test.cpp

@@ -79 +79 @@
 DefaultGenoConvManager gcm;
 gcm.addDefaultConverters();
-Geno::useConverters(gcm);
+Geno::useConverters(&gcm);
 
+Geno::Validators validators;
+Geno::useValidators(&validators);
 ModelGenoValidator model_validator;
-Geno::addValidator(&model_validator); //This simple validator handles all cases where a converter for a particular format is available but there is no genetic operator. Converters may be less strict in detecting invalid genotypes but it is better than nothing
+validators+=&model_validator; //This simple validator handles all cases where a converter for a particular format is available but there is no genetic operator. Converters may be less strict in detecting invalid genotypes but it is better than nothing
 
 SString gen(argc>1?argv[1]:"X[|G:1.23]");
-if (!strcmp(gen,"-"))
+if (!strcmp(gen.c_str(),"-"))
         {
         gen=0;
@@ -92 +94 @@
         }
 Geno g(gen);
-printf("\nSource genotype: '%s'\n",(const char*)g.getGene());
+printf("\nSource genotype: '%s'\n",g.getGene().c_str());
 printf("                  ( format %c %s)\n",
-       g.getFormat(), (const char*)g.getComment());
+       g.getFormat(), g.getComment().c_str());
 
 Model m(g);//.getConverted('0'));
@@ -112 +114 @@
 save_as_f0(f0_no_skipping_defaults,m,false);
 
-printf("\n==== with defdata (skips default values) ======\n%s\n",(const char*)f0_skipping_defaults);
-printf("\n==== without defdata (saves all fields) ======\n%s\n",(const char*)f0_no_skipping_defaults);
+printf("\n==== with defdata (skips default values) ======\n%s\n",f0_skipping_defaults.c_str());
+printf("\n==== without defdata (saves all fields) ======\n%s\n",f0_no_skipping_defaults.c_str());
 
 return 0;