diff --git a/src/libaevol/7/FuzzyFactory_7.cpp b/src/libaevol/7/FuzzyFactory_7.cpp index ea9b751574f4258b736bdaf007161348ebc7f2ce..9048e0e2ff8e9034f261686e9125e3816d7bd1f4 100644 --- a/src/libaevol/7/FuzzyFactory_7.cpp +++ b/src/libaevol/7/FuzzyFactory_7.cpp @@ -35,10 +35,10 @@ namespace aevol { AbstractFuzzy_7* fuzz = nullptr; switch (flavor_) { - case FuzzyFactory_Flavor::VECTOR: + case FuzzyFlavor::VECTOR: fuzz = new Vector_Fuzzy(); break; - case FuzzyFactory_Flavor::DISCRETE_DOUBLE_TABLE: + case FuzzyFlavor::DISCRETE_DOUBLE_TABLE: // printf("Size %d \n",PHENOTYPE_VECTOR_SIZE); fuzz = new Discrete_Double_Fuzzy(PHENOTYPE_VECTOR_SIZE); break; diff --git a/src/libaevol/7/FuzzyFactory_7.h b/src/libaevol/7/FuzzyFactory_7.h index 705fe88b23e7f52784e2ae9f79c0bbdccb316ae8..94e580fdbdbd3fec886679e78bb0082554593030 100644 --- a/src/libaevol/7/FuzzyFactory_7.h +++ b/src/libaevol/7/FuzzyFactory_7.h @@ -30,7 +30,8 @@ #include "AbstractFuzzy_7.h" namespace aevol { - enum FuzzyFactory_Flavor { + enum FuzzyFlavor { + // enum class FuzzyFactory_Flavor : uint8_t { VECTOR = 1, DISCRETE_DOUBLE_TABLE = 3 }; @@ -41,7 +42,7 @@ namespace aevol { public: FuzzyFactory_7(int flavor, int pool_size, int sampling, int pop_size = -1) { - flavor_ = (FuzzyFactory_Flavor)flavor; + flavor_ = (FuzzyFlavor)flavor; // printf("FuzzyFactory %d\ n",flavor_); pool_size_ = pool_size; if (flavor_>=2) { @@ -84,7 +85,7 @@ namespace aevol { std::list<AbstractFuzzy_7 *> list_unused_fuzzy_; std::vector<std::list<AbstractFuzzy_7 *>> local_list_unused_fuzzy_; - FuzzyFactory_Flavor flavor_; + FuzzyFlavor flavor_; size_t pool_size_; size_t global_pool_size_ = 256;