From c37ce4120e24c4f09c9b58f0435fa71e4526a51a Mon Sep 17 00:00:00 2001
From: David Parsons <david.parsons@inria.fr>
Date: Fri, 7 Apr 2023 10:50:44 +0200
Subject: [PATCH] rename FuzzyFactory_Flavor -> FuzzyFlavor
---
src/libaevol/7/FuzzyFactory_7.cpp | 4 ++--
src/libaevol/7/FuzzyFactory_7.h | 7 ++++---
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/libaevol/7/FuzzyFactory_7.cpp b/src/libaevol/7/FuzzyFactory_7.cpp
index ea9b75157..9048e0e2f 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 705fe88b2..94e580fdb 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;
--
GitLab