also move componant headers into a componant subdirectory

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)

componant/cap.cpp

-#include "cap.h"
-#include "strops.h"
+#include "componant/cap.h"
 #include <cstdlib>
 #include <math.h>
 #include <cassert>

componant/componant.cpp

-#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;

componant/constantphase.cpp

-#include "constantphase.h"
-#include "strops.h"
+#include "componant/constantphase.h"
 #include <cstdlib>
 #include <string>
 #define _USE_MATH_DEFINES

finitetr.cpp → componant/finitetr.cpp

-#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"
 

componant/inductor.cpp

-#include "inductor.h"
-#include "strops.h"
+#include "componant/inductor.h"
 #include <cstdlib>
 #include <math.h>
 #include <cassert>

componant/paralellseriel.cpp

-#include "paralellseriel.h"
-#include "componant.h"
+#include "componant/paralellseriel.h"
+#include "componant/componant.h"
 
 using namespace eis;
 

componant/resistor.cpp

-#include "resistor.h"
-#include "strops.h"
+#include "componant/resistor.h"
 #include <vector>
 #include <math.h>
 #include <cassert>

componant/warburg.cpp

-#include "warburg.h"
-#include "strops.h"
+#include "componant/warburg.h"
 #include <cstdlib>
 #include <cmath>
 #include <cassert>

eisgenerator/model.h

@@ -7,7 +7,7 @@
 #include <functional>
 
 #include "eistype.h"
-#include "componant.h"
+#include "componant/componant.h"
 
 namespace eis
 {

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"
 

translators.cpp

@@ -9,7 +9,7 @@
 #include "strops.h"
 #include "eistype.h"
 #include "log.h"
-#include "componant.h"
+#include "componant/componant.h"
 
 namespace eis
 {