diff --git a/src/libaevol/7/fuzzy/FuzzyFactory_7.h b/src/libaevol/7/fuzzy/FuzzyFactory_7.h index 791b3246c29e3c8c47f82bcaa9003e61268e21a1..753003af6dfeb0ccaa19d04922f1315202a84601 100644 --- a/src/libaevol/7/fuzzy/FuzzyFactory_7.h +++ b/src/libaevol/7/fuzzy/FuzzyFactory_7.h @@ -53,40 +53,33 @@ std::string to_string(const FuzzyFlavor& ff) { - class FuzzyFactory_7 { - public: +class FuzzyFactory_7 { + public: FuzzyFactory_7(FuzzyFlavor flavor, int pool_size, int sampling, int pop_size = -1); ~FuzzyFactory_7(); + void init(int pop_size); void stats(); + AbstractFuzzy_7 *get_fuzzy(); + void give_back(AbstractFuzzy_7 *fuzzy); + private: + AbstractFuzzy_7* createFuzzy(); + std::list<AbstractFuzzy_7 *> list_unused_fuzzy_; + std::vector<std::list<AbstractFuzzy_7 *>> local_list_unused_fuzzy_; - void init(int pop_size); + FuzzyFlavor flavor_; + size_t pool_size_; + size_t global_pool_size_ = 256; + size_t local_pool_size_ = 256; + int32_t nb_local_pool = 0; - AbstractFuzzy_7 *get_fuzzy(); - - void give_back(AbstractFuzzy_7 *fuzzy); - - private: - AbstractFuzzy_7* createFuzzy(); - - std::list<AbstractFuzzy_7 *> list_unused_fuzzy_; - std::vector<std::list<AbstractFuzzy_7 *>> local_list_unused_fuzzy_; - - FuzzyFlavor flavor_; - size_t pool_size_; - - size_t global_pool_size_ = 256; - size_t local_pool_size_ = 256; - - int32_t nb_local_pool = 0; - - int32_t PHENOTYPE_VECTOR_SIZE = -1; - double D_PHENOTYPE_VECTOR_SIZE = ((double)PHENOTYPE_VECTOR_SIZE); - }; + int32_t PHENOTYPE_VECTOR_SIZE = -1; + double D_PHENOTYPE_VECTOR_SIZE = ((double)PHENOTYPE_VECTOR_SIZE); +}; } #endif //AEVOL_DNAFACTORY_H