From 0c9fbdf381041978a097f911521ffb167166c6c0 Mon Sep 17 00:00:00 2001
From: David Parsons <david.parsons@inria.fr>
Date: Fri, 7 Apr 2023 14:31:55 +0200
Subject: [PATCH] move Fuzzy stuff in directory "fuzzy"

---
 src/libaevol/7/ExpManager_7.cpp                    |  4 ++--
 src/libaevol/7/ExpManager_7.h                      |  2 +-
 src/libaevol/7/Individual_7.h                      |  4 ++--
 src/libaevol/7/{ => fuzzy}/AbstractFuzzy_7.h       |  0
 .../7/{ => fuzzy}/Discrete_Double_Fuzzy.cpp        |  0
 src/libaevol/7/{ => fuzzy}/Discrete_Double_Fuzzy.h |  0
 src/libaevol/7/{ => fuzzy}/FuzzyFactory_7.cpp      |  0
 src/libaevol/7/{ => fuzzy}/FuzzyFactory_7.h        |  0
 src/libaevol/7/{ => fuzzy}/Vector_Fuzzy.cpp        |  0
 src/libaevol/7/{ => fuzzy}/Vector_Fuzzy.h          |  0
 src/libaevol/CMakeLists.txt                        | 14 +++++++-------
 src/libaevol/io/LightTree.h                        |  2 +-
 src/libaevol/io/parameters/ParamValues.h           |  2 +-
 .../raevol/SIMD_PhenotypicTargetHandler_R.cpp      |  2 +-
 .../raevol/SIMD_PhenotypicTargetHandler_R.h        |  4 ++--
 src/post_treatments/aevol_post_create_csv_7.cpp    |  6 +++---
 src/post_treatments/aevol_post_create_eps_7.cpp    |  6 +++---
 17 files changed, 23 insertions(+), 23 deletions(-)
 rename src/libaevol/7/{ => fuzzy}/AbstractFuzzy_7.h (100%)
 rename src/libaevol/7/{ => fuzzy}/Discrete_Double_Fuzzy.cpp (100%)
 rename src/libaevol/7/{ => fuzzy}/Discrete_Double_Fuzzy.h (100%)
 rename src/libaevol/7/{ => fuzzy}/FuzzyFactory_7.cpp (100%)
 rename src/libaevol/7/{ => fuzzy}/FuzzyFactory_7.h (100%)
 rename src/libaevol/7/{ => fuzzy}/Vector_Fuzzy.cpp (100%)
 rename src/libaevol/7/{ => fuzzy}/Vector_Fuzzy.h (100%)

diff --git a/src/libaevol/7/ExpManager_7.cpp b/src/libaevol/7/ExpManager_7.cpp
index 6690e0560..0522049b9 100644
--- a/src/libaevol/7/ExpManager_7.cpp
+++ b/src/libaevol/7/ExpManager_7.cpp
@@ -26,7 +26,7 @@
 
 
 #include "ExpManager_7.h"
-#include "AbstractFuzzy_7.h"
+#include "7/fuzzy/AbstractFuzzy_7.h"
 #include "7/Stats_7.h"
 #include "DnaMutator.h"
 #include "legacy/ExpManager.h"
@@ -34,7 +34,7 @@
 #include "Protein_7.h"
 #include "Rna_7.h"
 #include "List_Metadata.h"
-#include "FuzzyFactory_7.h"
+#include "7/fuzzy/FuzzyFactory_7.h"
 
 #include <algorithm>
 #include <err.h>
diff --git a/src/libaevol/7/ExpManager_7.h b/src/libaevol/7/ExpManager_7.h
index 98e957d98..384dea905 100644
--- a/src/libaevol/7/ExpManager_7.h
+++ b/src/libaevol/7/ExpManager_7.h
@@ -33,7 +33,7 @@
 #include "PhenotypicTargetHandler.h"
 #include "raevol/SIMD_PhenotypicTargetHandler_R.h"
 #include "ExpSetup.h"
-#include "FuzzyFactory_7.h"
+#include "7/fuzzy/FuzzyFactory_7.h"
 #include "World.h"
 
 namespace aevol {
diff --git a/src/libaevol/7/Individual_7.h b/src/libaevol/7/Individual_7.h
index 65482d160..146fcf288 100644
--- a/src/libaevol/7/Individual_7.h
+++ b/src/libaevol/7/Individual_7.h
@@ -36,8 +36,8 @@
 #include "Observable.h"
 #include "PhenotypicTargetHandler.h"
 #include "PromoterList.h"
-#include "Vector_Fuzzy.h"
-#include "FuzzyFactory_7.h"
+#include "7/fuzzy/Vector_Fuzzy.h"
+#include "7/fuzzy/FuzzyFactory_7.h"
 #include "ae_enums.h"
 
 namespace aevol {
diff --git a/src/libaevol/7/AbstractFuzzy_7.h b/src/libaevol/7/fuzzy/AbstractFuzzy_7.h
similarity index 100%
rename from src/libaevol/7/AbstractFuzzy_7.h
rename to src/libaevol/7/fuzzy/AbstractFuzzy_7.h
diff --git a/src/libaevol/7/Discrete_Double_Fuzzy.cpp b/src/libaevol/7/fuzzy/Discrete_Double_Fuzzy.cpp
similarity index 100%
rename from src/libaevol/7/Discrete_Double_Fuzzy.cpp
rename to src/libaevol/7/fuzzy/Discrete_Double_Fuzzy.cpp
diff --git a/src/libaevol/7/Discrete_Double_Fuzzy.h b/src/libaevol/7/fuzzy/Discrete_Double_Fuzzy.h
similarity index 100%
rename from src/libaevol/7/Discrete_Double_Fuzzy.h
rename to src/libaevol/7/fuzzy/Discrete_Double_Fuzzy.h
diff --git a/src/libaevol/7/FuzzyFactory_7.cpp b/src/libaevol/7/fuzzy/FuzzyFactory_7.cpp
similarity index 100%
rename from src/libaevol/7/FuzzyFactory_7.cpp
rename to src/libaevol/7/fuzzy/FuzzyFactory_7.cpp
diff --git a/src/libaevol/7/FuzzyFactory_7.h b/src/libaevol/7/fuzzy/FuzzyFactory_7.h
similarity index 100%
rename from src/libaevol/7/FuzzyFactory_7.h
rename to src/libaevol/7/fuzzy/FuzzyFactory_7.h
diff --git a/src/libaevol/7/Vector_Fuzzy.cpp b/src/libaevol/7/fuzzy/Vector_Fuzzy.cpp
similarity index 100%
rename from src/libaevol/7/Vector_Fuzzy.cpp
rename to src/libaevol/7/fuzzy/Vector_Fuzzy.cpp
diff --git a/src/libaevol/7/Vector_Fuzzy.h b/src/libaevol/7/fuzzy/Vector_Fuzzy.h
similarity index 100%
rename from src/libaevol/7/Vector_Fuzzy.h
rename to src/libaevol/7/fuzzy/Vector_Fuzzy.h
diff --git a/src/libaevol/CMakeLists.txt b/src/libaevol/CMakeLists.txt
index 4e349f196..c906493b3 100644
--- a/src/libaevol/CMakeLists.txt
+++ b/src/libaevol/CMakeLists.txt
@@ -129,11 +129,11 @@ set(libaevol_sources
         7/Promoter.h
         7/PromoterList.cpp
         7/PromoterList.h
-	7/AbstractFuzzy_7.h
-	7/FuzzyFactory_7.cpp
-	7/FuzzyFactory_7.h
-	7/Discrete_Double_Fuzzy.cpp
-	7/Discrete_Double_Fuzzy.h
+        7/fuzzy/AbstractFuzzy_7.h
+        7/fuzzy/FuzzyFactory_7.cpp
+        7/fuzzy/FuzzyFactory_7.h
+        7/fuzzy/Discrete_Double_Fuzzy.cpp
+        7/fuzzy/Discrete_Double_Fuzzy.h
 
         rng/JumpingMT.cpp
   rng/JumpingMT.h
@@ -179,8 +179,8 @@ set(libaevol_sources
         7/List_Metadata.h
         7/DnaFactory.cpp
         7/DnaFactory.h
-        7/Vector_Fuzzy.h
-        7/Vector_Fuzzy.cpp
+        7/fuzzy/Vector_Fuzzy.h
+        7/fuzzy/Vector_Fuzzy.cpp
   )
 
 if ( ${with-x} )
diff --git a/src/libaevol/io/LightTree.h b/src/libaevol/io/LightTree.h
index 310f92f33..086e44150 100644
--- a/src/libaevol/io/LightTree.h
+++ b/src/libaevol/io/LightTree.h
@@ -36,7 +36,7 @@
 #include "ObservableEvent.h"
 #include "Observer.h"
 #include "ReplicationReport.h"
-#include "FuzzyFactory_7.h"
+#include "7/fuzzy/FuzzyFactory_7.h"
 #include <cstdio>
 #include <cstdlib>
 #include <inttypes.h>
diff --git a/src/libaevol/io/parameters/ParamValues.h b/src/libaevol/io/parameters/ParamValues.h
index 099464841..76821d68c 100644
--- a/src/libaevol/io/parameters/ParamValues.h
+++ b/src/libaevol/io/parameters/ParamValues.h
@@ -39,7 +39,7 @@
 #include "ae_enums.h"
 #include "macros.h"
 #include "phenotype/Gaussian.h"
-#include "FuzzyFactory_7.h"
+#include "7/fuzzy/FuzzyFactory_7.h"
 
 #ifdef __REGUL
   #include "legacy/raevol/Protein_R.h"
diff --git a/src/libaevol/raevol/SIMD_PhenotypicTargetHandler_R.cpp b/src/libaevol/raevol/SIMD_PhenotypicTargetHandler_R.cpp
index b6344e614..4d228decb 100644
--- a/src/libaevol/raevol/SIMD_PhenotypicTargetHandler_R.cpp
+++ b/src/libaevol/raevol/SIMD_PhenotypicTargetHandler_R.cpp
@@ -25,7 +25,7 @@
 // ****************************************************************************
 
 #include "SIMD_PhenotypicTargetHandler_R.h"
-#include "Discrete_Double_Fuzzy.h"
+#include "7/fuzzy/Discrete_Double_Fuzzy.h"
 #include "ExpSetup.h"
 #include "Protein_7.h"
 
diff --git a/src/libaevol/raevol/SIMD_PhenotypicTargetHandler_R.h b/src/libaevol/raevol/SIMD_PhenotypicTargetHandler_R.h
index 5aed13c0a..55d9a0b96 100644
--- a/src/libaevol/raevol/SIMD_PhenotypicTargetHandler_R.h
+++ b/src/libaevol/raevol/SIMD_PhenotypicTargetHandler_R.h
@@ -31,8 +31,8 @@
 #include "PhenotypicTargetHandler_R.h"
 #include "phenotype/Gaussian.h"
 #include "legacy/raevol/Protein_R.h"
-#include "AbstractFuzzy_7.h"
-#include "FuzzyFactory_7.h"
+#include "7/fuzzy/AbstractFuzzy_7.h"
+#include "7/fuzzy/FuzzyFactory_7.h"
 #include <list>
 #include <vector>
 
diff --git a/src/post_treatments/aevol_post_create_csv_7.cpp b/src/post_treatments/aevol_post_create_csv_7.cpp
index dd3f4fc05..46e89ea49 100644
--- a/src/post_treatments/aevol_post_create_csv_7.cpp
+++ b/src/post_treatments/aevol_post_create_csv_7.cpp
@@ -43,10 +43,10 @@
 #include "aevol.h"
 #include "Rna_7.h"
 #include "Protein_7.h"
-#include "AbstractFuzzy_7.h"
-#include "Discrete_Double_Fuzzy.h"
+#include "7/fuzzy/AbstractFuzzy_7.h"
+#include "7/fuzzy/Discrete_Double_Fuzzy.h"
 #include "List_Metadata.h"
-#include "Vector_Fuzzy.h"
+#include "7/fuzzy/Vector_Fuzzy.h"
 using namespace aevol;
 
 // ========
diff --git a/src/post_treatments/aevol_post_create_eps_7.cpp b/src/post_treatments/aevol_post_create_eps_7.cpp
index c2f914d4c..39d53aa99 100644
--- a/src/post_treatments/aevol_post_create_eps_7.cpp
+++ b/src/post_treatments/aevol_post_create_eps_7.cpp
@@ -43,9 +43,9 @@
 #include "Rna_7.h"
 #include "Protein_7.h"
 #include "List_Metadata.h"
-#include "AbstractFuzzy_7.h"
-#include "Discrete_Double_Fuzzy.h"
-#include "Vector_Fuzzy.h"
+#include "7/fuzzy/AbstractFuzzy_7.h"
+#include "7/fuzzy/Discrete_Double_Fuzzy.h"
+#include "7/fuzzy/Vector_Fuzzy.h"
 using namespace aevol;
 
 // ========
-- 
GitLab