Changeset 348 for cpp/frams/genetics/preconfigured.h

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/preconfigured.h (modified) (2 diffs)

cpp/frams/genetics/preconfigured.h

@@ -18 +18 @@
 DefaultGenoConvManager gcm;
 GenMan genman;
+Geno::Validators validators;
 ModelGenoValidator model_validator; //validation through conversion
 
@@ -23 +24 @@
         {
         gcm.addDefaultConverters(); //without converters, the application would only handle "format 0" genotypes
-        Geno::useConverters(gcm);
+        Geno::useConverters(&gcm);
 
-        Geno::addValidator(&genman); //primary validation: use the extended validity checking (through dedicated genetic operators)
-        Geno::addValidator(&model_validator); //secondary validation: this simple validator handles all cases when there is no dedicated genetic validation operator, but a converter for a particular format is available. Converters may be less strict in detecting invalid genotypes but using them and checking whether they produced a valid f0 genotype is also some way to tell whether the initial genotype was valid. Otherwise, without dedicated genetic validation operator, we would have no validity check at all.
-        }
-};
-
-/** Initialization procedure for applications adding their own validators */
-class PreconfiguredGenetics_NoValidators
-{
-  public:
-DefaultGenoConvManager gcm;
-
-PreconfiguredGenetics_NoValidators()
-        {
-        gcm.addDefaultConverters(); //without converters, the application would only handle "format 0" genotypes
-        Geno::useConverters(gcm);
+        Geno::useValidators(&validators);
+        validators+=&genman; //primary validation: use the extended validity checking (through dedicated genetic operators)
+        validators+=&model_validator; //secondary validation: this simple validator handles all cases when there is no dedicated genetic validation operator, but a converter for a particular format is available. Converters may be less strict in detecting invalid genotypes but using them and checking whether they produced a valid f0 genotype is also some way to tell whether the initial genotype was valid. Otherwise, without dedicated genetic validation operator, we would have no validity check at all.
         }
 };
 
 #endif
-