From c1f45f8bc1ebb19f570961cc2ac08c222323a359 Mon Sep 17 00:00:00 2001
From: Carl Philipp Klemm <philipp@uvos.xyz>
Date: Mon, 6 Nov 2023 11:28:26 +0100
Subject: [PATCH] also move componant headers into a componant subdirectory

---
 CMakeLists.txt                                | 18 ++++++++++--------
 componant/cap.cpp                             |  3 +--
 componant/componant.cpp                       | 16 ++++++++--------
 componant/constantphase.cpp                   |  3 +--
 finitetr.cpp => componant/finitetr.cpp        | 12 +++++-------
 componant/inductor.cpp                        |  3 +--
 componant/paralellseriel.cpp                  |  4 ++--
 componant/resistor.cpp                        |  3 +--
 componant/warburg.cpp                         |  3 +--
 eisgenerator/{ => componant}/cap.h            |  0
 eisgenerator/{ => componant}/componant.h      |  0
 eisgenerator/{ => componant}/constantphase.h  |  0
 eisgenerator/{ => componant}/finitetr.h       |  0
 eisgenerator/{ => componant}/inductor.h       |  0
 eisgenerator/{ => componant}/paralellseriel.h |  0
 eisgenerator/{ => componant}/resistor.h       |  0
 eisgenerator/{ => componant}/warburg.h        |  0
 eisgenerator/model.h                          |  2 +-
 model.cpp                                     | 11 ++---------
 translators.cpp                               |  2 +-
 20 files changed, 34 insertions(+), 46 deletions(-)
 rename finitetr.cpp => componant/finitetr.cpp (93%)
 rename eisgenerator/{ => componant}/cap.h (100%)
 rename eisgenerator/{ => componant}/componant.h (100%)
 rename eisgenerator/{ => componant}/constantphase.h (100%)
 rename eisgenerator/{ => componant}/finitetr.h (100%)
 rename eisgenerator/{ => componant}/inductor.h (100%)
 rename eisgenerator/{ => componant}/paralellseriel.h (100%)
 rename eisgenerator/{ => componant}/resistor.h (100%)
 rename eisgenerator/{ => componant}/warburg.h (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 15b37f4..fc31345 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,6 +14,7 @@ set(SRC_FILES
 	componant/constantphase.cpp
 	componant/warburg.cpp
 	componant/paralellseriel.cpp
+	componant/finitetr.cpp
 	model.cpp
 	log.cpp
 	normalize.cpp
@@ -21,7 +22,6 @@ set(SRC_FILES
 	log.cpp
 	normalize.cpp
 	basicmath.cpp
-	finitetr.cpp
 	eistype.cpp
 	strops.cpp
 	translators.cpp
@@ -32,18 +32,19 @@ set(SRC_FILES
 set(API_HEADERS_CPP_DIR eisgenerator/)
 
 set(API_HEADERS_CPP
-	${API_HEADERS_CPP_DIR}/componant.h
-	${API_HEADERS_CPP_DIR}/cap.h
-	${API_HEADERS_CPP_DIR}/resistor.h
-	${API_HEADERS_CPP_DIR}/constantphase.h
-	${API_HEADERS_CPP_DIR}/warburg.h
+	${API_HEADERS_CPP_DIR}/componant/componant.h
+	${API_HEADERS_CPP_DIR}/componant/cap.h
+	${API_HEADERS_CPP_DIR}/componant/resistor.h
+	${API_HEADERS_CPP_DIR}/componant/constantphase.h
+	${API_HEADERS_CPP_DIR}/componant/warburg.h
+	${API_HEADERS_CPP_DIR}/componant/inductor.h
+	${API_HEADERS_CPP_DIR}/componant/finitetr.h
+	${API_HEADERS_CPP_DIR}/componant/paralellseriel.h
 	${API_HEADERS_CPP_DIR}/model.h
 	${API_HEADERS_CPP_DIR}/log.h
-	${API_HEADERS_CPP_DIR}/paralellseriel.h
 	${API_HEADERS_CPP_DIR}/basicmath.h
 	${API_HEADERS_CPP_DIR}/eistype.h
 	${API_HEADERS_CPP_DIR}/normalize.h
-	${API_HEADERS_CPP_DIR}/inductor.h
 	${API_HEADERS_CPP_DIR}/translators.h
 )
 
@@ -82,6 +83,7 @@ endif(WIN32)
 set(COMMON_COMPILE_FLAGS "-Wall -O2 -march=native -g")
 
 if(PROFILE_ENABLED)
+	message("Profileing enabled")
 	set(COMMON_COMPILE_FLAGS "${COMMON_COMPILE_FLAGS} -pg -fno-omit-frame-pointer")
 	set(COMMON_LINK_FLAGS "${COMMON_LINK_FLAGS} -pg -fno-omit-frame-pointer")
 endif(PROFILE_ENABLED)
diff --git a/componant/cap.cpp b/componant/cap.cpp
index 8fadbf7..ff4e349 100644
--- a/componant/cap.cpp
+++ b/componant/cap.cpp
@@ -1,5 +1,4 @@
-#include "cap.h"
-#include "strops.h"
+#include "componant/cap.h"
 #include <cstdlib>
 #include <math.h>
 #include <cassert>
diff --git a/componant/componant.cpp b/componant/componant.cpp
index 1d099f0..dcaed9a 100644
--- a/componant/componant.cpp
+++ b/componant/componant.cpp
@@ -1,14 +1,14 @@
-#include "componant.h"
+#include "componant/componant.h"
 #include <assert.h>
 #include <sstream>
-#include "paralellseriel.h"
-#include "resistor.h"
-#include "cap.h"
-#include "constantphase.h"
-#include "warburg.h"
+#include "componant/paralellseriel.h"
+#include "componant/resistor.h"
+#include "componant/cap.h"
+#include "componant/constantphase.h"
+#include "componant/warburg.h"
 #include "log.h"
-#include "inductor.h"
-#include "finitetr.h"
+#include "componant/inductor.h"
+#include "componant/finitetr.h"
 #include "randomgen.h"
 
 using namespace eis;
diff --git a/componant/constantphase.cpp b/componant/constantphase.cpp
index 5e68df6..89fed41 100644
--- a/componant/constantphase.cpp
+++ b/componant/constantphase.cpp
@@ -1,5 +1,4 @@
-#include "constantphase.h"
-#include "strops.h"
+#include "componant/constantphase.h"
 #include <cstdlib>
 #include <string>
 #define _USE_MATH_DEFINES
diff --git a/finitetr.cpp b/componant/finitetr.cpp
similarity index 93%
rename from finitetr.cpp
rename to componant/finitetr.cpp
index 3d6a861..13d2767 100644
--- a/finitetr.cpp
+++ b/componant/finitetr.cpp
@@ -1,13 +1,11 @@
-#include "finitetr.h"
+#include "componant/finitetr.h"
 #include <cstdlib>
 #include <math.h>
 
-#include "eisgenerator/componant.h"
-#include "eisgenerator/paralellseriel.h"
-#include "eisgenerator/resistor.h"
-#include "paralellseriel.h"
-#include "cap.h"
-#include "resistor.h"
+#include "componant/componant.h"
+#include "componant/paralellseriel.h"
+#include "componant/resistor.h"
+#include "componant/cap.h"
 #include "log.h"
 #include "strops.h"
 
diff --git a/componant/inductor.cpp b/componant/inductor.cpp
index 39bf77b..d2d8ea1 100644
--- a/componant/inductor.cpp
+++ b/componant/inductor.cpp
@@ -1,5 +1,4 @@
-#include "inductor.h"
-#include "strops.h"
+#include "componant/inductor.h"
 #include <cstdlib>
 #include <math.h>
 #include <cassert>
diff --git a/componant/paralellseriel.cpp b/componant/paralellseriel.cpp
index d40433b..24d006f 100644
--- a/componant/paralellseriel.cpp
+++ b/componant/paralellseriel.cpp
@@ -1,5 +1,5 @@
-#include "paralellseriel.h"
-#include "componant.h"
+#include "componant/paralellseriel.h"
+#include "componant/componant.h"
 
 using namespace eis;
 
diff --git a/componant/resistor.cpp b/componant/resistor.cpp
index 9681714..17fdbe9 100644
--- a/componant/resistor.cpp
+++ b/componant/resistor.cpp
@@ -1,5 +1,4 @@
-#include "resistor.h"
-#include "strops.h"
+#include "componant/resistor.h"
 #include <vector>
 #include <math.h>
 #include <cassert>
diff --git a/componant/warburg.cpp b/componant/warburg.cpp
index f0fc0f2..4471230 100644
--- a/componant/warburg.cpp
+++ b/componant/warburg.cpp
@@ -1,5 +1,4 @@
-#include "warburg.h"
-#include "strops.h"
+#include "componant/warburg.h"
 #include <cstdlib>
 #include <cmath>
 #include <cassert>
diff --git a/eisgenerator/cap.h b/eisgenerator/componant/cap.h
similarity index 100%
rename from eisgenerator/cap.h
rename to eisgenerator/componant/cap.h
diff --git a/eisgenerator/componant.h b/eisgenerator/componant/componant.h
similarity index 100%
rename from eisgenerator/componant.h
rename to eisgenerator/componant/componant.h
diff --git a/eisgenerator/constantphase.h b/eisgenerator/componant/constantphase.h
similarity index 100%
rename from eisgenerator/constantphase.h
rename to eisgenerator/componant/constantphase.h
diff --git a/eisgenerator/finitetr.h b/eisgenerator/componant/finitetr.h
similarity index 100%
rename from eisgenerator/finitetr.h
rename to eisgenerator/componant/finitetr.h
diff --git a/eisgenerator/inductor.h b/eisgenerator/componant/inductor.h
similarity index 100%
rename from eisgenerator/inductor.h
rename to eisgenerator/componant/inductor.h
diff --git a/eisgenerator/paralellseriel.h b/eisgenerator/componant/paralellseriel.h
similarity index 100%
rename from eisgenerator/paralellseriel.h
rename to eisgenerator/componant/paralellseriel.h
diff --git a/eisgenerator/resistor.h b/eisgenerator/componant/resistor.h
similarity index 100%
rename from eisgenerator/resistor.h
rename to eisgenerator/componant/resistor.h
diff --git a/eisgenerator/warburg.h b/eisgenerator/componant/warburg.h
similarity index 100%
rename from eisgenerator/warburg.h
rename to eisgenerator/componant/warburg.h
diff --git a/eisgenerator/model.h b/eisgenerator/model.h
index 4713f38..cd5c462 100644
--- a/eisgenerator/model.h
+++ b/eisgenerator/model.h
@@ -7,7 +7,7 @@
 #include <functional>
 
 #include "eistype.h"
-#include "componant.h"
+#include "componant/componant.h"
 
 namespace eis
 {
diff --git a/model.cpp b/model.cpp
index ce60208..f334dc0 100644
--- a/model.cpp
+++ b/model.cpp
@@ -13,20 +13,13 @@
 #include <dlfcn.h>
 #include <functional>
 
-#include "componant.h"
+#include "componant/componant.h"
 #include "eistype.h"
 #include "strops.h"
-#include "cap.h"
-#include "resistor.h"
-#include "inductor.h"
-#include "constantphase.h"
-#include "finitetr.h"
-#include "warburg.h"
-#include "paralellseriel.h"
+#include "componant/paralellseriel.h"
 #include "log.h"
 #include "normalize.h"
 #include "basicmath.h"
-#include "randomgen.h"
 #include "compile.h"
 #include "compcache.h"
 
diff --git a/translators.cpp b/translators.cpp
index 0b96031..2b159bd 100644
--- a/translators.cpp
+++ b/translators.cpp
@@ -9,7 +9,7 @@
 #include "strops.h"
 #include "eistype.h"
 #include "log.h"
-#include "componant.h"
+#include "componant/componant.h"
 
 namespace eis
 {
-- 
GitLab