diff --git a/CMakeLists.txt b/CMakeLists.txt index c90e7250672716f16645689dc1f358338501658e..0ddd553eaa647b7d54cf2c1e1c82708f63aa01ff 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,6 @@ set(SRC_FILES constantphase.cpp warburg.cpp model.cpp - tokenize.cpp paralellseriel.cpp log.cpp normalize.cpp @@ -20,6 +19,7 @@ set(SRC_FILES basicmath.cpp finitetr.cpp eistype.cpp + strops.cpp ) set(API_HEADERS_CPP_DIR eisgenerator/) diff --git a/cap.cpp b/cap.cpp index 19933dd431e7b57c174d22cdd558ad978fad52f5..833883f92819a3062995e1bc725be64707c37fb7 100644 --- a/cap.cpp +++ b/cap.cpp @@ -1,5 +1,5 @@ #include "cap.h" -#include "tokenize.h" +#include "strops.h" #include <cstdlib> #include <math.h> diff --git a/constantphase.cpp b/constantphase.cpp index f83bba443675abf8234d65f03a7279436f8c7ce0..127b96ef68454177ab05c2439bcf3f70abab5320 100644 --- a/constantphase.cpp +++ b/constantphase.cpp @@ -1,5 +1,5 @@ #include "constantphase.h" -#include "tokenize.h" +#include "strops.h" #include <cstdlib> #define _USE_MATH_DEFINES #include <cmath> diff --git a/finitetr.cpp b/finitetr.cpp index 2572744956b3a5357b47c0a3492bca73a085d42c..726558adada79eeedb7ad33463d4dfa5870d0e2c 100644 --- a/finitetr.cpp +++ b/finitetr.cpp @@ -9,7 +9,7 @@ #include "cap.h" #include "resistor.h" #include "log.h" -#include "tokenize.h" +#include "strops.h" using namespace eis; diff --git a/inductor.cpp b/inductor.cpp index 195a78a4766e30fcff56a78efbf046e856e1837d..1d0a65604758722d048970d178befa77a8084df0 100644 --- a/inductor.cpp +++ b/inductor.cpp @@ -1,5 +1,5 @@ #include "inductor.h" -#include "tokenize.h" +#include "strops.h" #include <cstdlib> #include <math.h> diff --git a/model.cpp b/model.cpp index 61fb6ba748a2c342811ea507f095dad73e0353ad..72430bf15fec6ca4c63b8ef1bc4198d0fe40d748 100644 --- a/model.cpp +++ b/model.cpp @@ -3,7 +3,7 @@ #include <iostream> #include <assert.h> #include <vector> -#include "tokenize.h" +#include "strops.h" #include "cap.h" #include "resistor.h" #include "inductor.h" diff --git a/options.h b/options.h index f59e237876decd5e863687955765915498a98179..ba3f55ec9b9b5eff1a8a9b845b200f476e916049 100644 --- a/options.h +++ b/options.h @@ -4,7 +4,7 @@ #include <argp.h> #include "model.h" #include "log.h" -#include "tokenize.h" +#include "strops.h" const char *argp_program_version = "eisgenerator-1.0"; const char *argp_program_bug_address = "<carl@uvos.xyz>"; diff --git a/resistor.cpp b/resistor.cpp index c83b9e2e0e48d8d4cb7c3a4fda022b78b4b98e0b..8784285393f3796bd4041e17b356e12ca48519a6 100644 --- a/resistor.cpp +++ b/resistor.cpp @@ -1,5 +1,5 @@ #include "resistor.h" -#include "tokenize.h" +#include "strops.h" #include <vector> #include <math.h> diff --git a/tokenize.cpp b/strops.cpp similarity index 96% rename from tokenize.cpp rename to strops.cpp index b752e8c6efa1930f79e92664830c1daaacd940de..ab8e22cee23d5fc7e073480828df22f77379238b 100644 --- a/tokenize.cpp +++ b/strops.cpp @@ -1,4 +1,4 @@ -#include "tokenize.h" +#include "strops.h" std::vector<std::string> tokenize(const std::string& str, const char delim, const char ignBracketStart, const char ignBracketEnd, const char escapeChar) { diff --git a/tokenize.h b/strops.h similarity index 100% rename from tokenize.h rename to strops.h diff --git a/warburg.cpp b/warburg.cpp index c4e30f2d6f3b29cd05a7ad4f2b63e4be1c29d438..76aa7dffcc008557dd4982d4454f9df1f95b612a 100644 --- a/warburg.cpp +++ b/warburg.cpp @@ -1,5 +1,5 @@ #include "warburg.h" -#include "tokenize.h" +#include "strops.h" #include <cstdlib> #include <math.h>