From 7e21a2076e9ed18df4073868687ee5303e95edaa Mon Sep 17 00:00:00 2001
From: Carl Philipp Klemm <philipp@uvos.xyz>
Date: Mon, 6 Nov 2023 13:42:25 +0100
Subject: [PATCH] componants: rename getDefaultRange to getDefaultParameters
---
.gitmodules | 3 ---
componant/cap.cpp | 4 ++--
componant/componant.cpp | 2 +-
componant/constantphase.cpp | 4 ++--
componant/finitetr.cpp | 4 ++--
componant/inductor.cpp | 4 ++--
componant/resistor.cpp | 4 ++--
componant/warburg.cpp | 4 ++--
eisgenerator/componant/cap.h | 2 +-
eisgenerator/componant/componant.h | 2 +-
eisgenerator/componant/constantphase.h | 2 +-
eisgenerator/componant/finitetr.h | 2 +-
eisgenerator/componant/inductor.h | 2 +-
eisgenerator/componant/resistor.h | 2 +-
eisgenerator/componant/warburg.h | 2 +-
15 files changed, 20 insertions(+), 23 deletions(-)
diff --git a/.gitmodules b/.gitmodules
index d1e4404..e69de29 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "dlfcn-win32"]
- path = dlfcn-win32
- url = https://github.com/dlfcn-win32/dlfcn-win32.git
diff --git a/componant/cap.cpp b/componant/cap.cpp
index 05ab41e..935a615 100644
--- a/componant/cap.cpp
+++ b/componant/cap.cpp
@@ -20,7 +20,7 @@ Cap::Cap(std::string paramStr, size_t count, bool defaultToRange)
if(ranges.size() != paramCount())
{
- ranges = getDefaultRange(defaultToRange);
+ ranges = getDefaultParameters(defaultToRange);
if(defaultToRange)
{
for(eis::Range& range : ranges)
@@ -30,7 +30,7 @@ Cap::Cap(std::string paramStr, size_t count, bool defaultToRange)
}
}
-std::vector<eis::Range> Cap::getDefaultRange(bool range) const
+std::vector<eis::Range> Cap::getDefaultParameters(bool range) const
{
std::vector<eis::Range> out;
diff --git a/componant/componant.cpp b/componant/componant.cpp
index d048782..5b7a26b 100644
--- a/componant/componant.cpp
+++ b/componant/componant.cpp
@@ -28,7 +28,7 @@ std::vector<eis::Range> Componant::getParamRanges() const
return ranges;
}
-std::vector<eis::Range> Componant::getDefaultRange(bool range) const
+std::vector<eis::Range> Componant::getDefaultParameters(bool range) const
{
(void)range;
assert(paramCount() == 0);
diff --git a/componant/constantphase.cpp b/componant/constantphase.cpp
index ca9ddf1..6bbc251 100644
--- a/componant/constantphase.cpp
+++ b/componant/constantphase.cpp
@@ -40,7 +40,7 @@ Cpe::Cpe(std::string paramStr, size_t count, bool defaultToRange)
void Cpe::setDefaultParam(size_t count, bool defaultToRange)
{
- ranges = getDefaultRange(defaultToRange);
+ ranges = getDefaultParameters(defaultToRange);
if(defaultToRange)
{
for(eis::Range& range : ranges)
@@ -48,7 +48,7 @@ void Cpe::setDefaultParam(size_t count, bool defaultToRange)
}
}
-std::vector<eis::Range> Cpe::getDefaultRange(bool range) const
+std::vector<eis::Range> Cpe::getDefaultParameters(bool range) const
{
std::vector<eis::Range> out;
diff --git a/componant/finitetr.cpp b/componant/finitetr.cpp
index f1a89df..252ee1b 100644
--- a/componant/finitetr.cpp
+++ b/componant/finitetr.cpp
@@ -32,7 +32,7 @@ void FiniteTransmitionline::setDefaultParam(size_t count, bool defaultToRange)
_R = 1000;
_n = 4;
- ranges = getDefaultRange(defaultToRange);
+ ranges = getDefaultParameters(defaultToRange);
if(defaultToRange)
{
@@ -41,7 +41,7 @@ void FiniteTransmitionline::setDefaultParam(size_t count, bool defaultToRange)
}
}
-std::vector<eis::Range> FiniteTransmitionline::getDefaultRange(bool range) const
+std::vector<eis::Range> FiniteTransmitionline::getDefaultParameters(bool range) const
{
const fvalue C = 1e-6;
const fvalue R = 1000;
diff --git a/componant/inductor.cpp b/componant/inductor.cpp
index b0b3f01..f2fc73c 100644
--- a/componant/inductor.cpp
+++ b/componant/inductor.cpp
@@ -20,7 +20,7 @@ Inductor::Inductor(std::string paramStr, size_t count, bool defaultToRange)
if(ranges.size() != paramCount())
{
- ranges = getDefaultRange(defaultToRange);
+ ranges = getDefaultParameters(defaultToRange);
if(defaultToRange)
{
for(eis::Range& range : ranges)
@@ -30,7 +30,7 @@ Inductor::Inductor(std::string paramStr, size_t count, bool defaultToRange)
}
}
-std::vector<eis::Range> Inductor::getDefaultRange(bool range) const
+std::vector<eis::Range> Inductor::getDefaultParameters(bool range) const
{
std::vector<eis::Range> out;
diff --git a/componant/resistor.cpp b/componant/resistor.cpp
index 06d3701..59e3dbe 100644
--- a/componant/resistor.cpp
+++ b/componant/resistor.cpp
@@ -20,7 +20,7 @@ Resistor::Resistor(std::string paramStr, size_t count, bool defaultToRange)
if(ranges.size() != paramCount())
{
- ranges = getDefaultRange(defaultToRange);
+ ranges = getDefaultParameters(defaultToRange);
if(defaultToRange)
{
for(eis::Range& range : ranges)
@@ -30,7 +30,7 @@ Resistor::Resistor(std::string paramStr, size_t count, bool defaultToRange)
}
}
-std::vector<eis::Range> Resistor::getDefaultRange(bool range) const
+std::vector<eis::Range> Resistor::getDefaultParameters(bool range) const
{
std::vector<eis::Range> out;
diff --git a/componant/warburg.cpp b/componant/warburg.cpp
index c5b58a9..ddc1f6f 100644
--- a/componant/warburg.cpp
+++ b/componant/warburg.cpp
@@ -20,7 +20,7 @@ Warburg::Warburg(std::string paramStr, size_t count, bool defaultToRange)
if(ranges.size() != paramCount())
{
- ranges = getDefaultRange(defaultToRange);
+ ranges = getDefaultParameters(defaultToRange);
if(defaultToRange)
{
for(eis::Range& range : ranges)
@@ -30,7 +30,7 @@ Warburg::Warburg(std::string paramStr, size_t count, bool defaultToRange)
}
}
-std::vector<eis::Range> Warburg::getDefaultRange(bool range) const
+std::vector<eis::Range> Warburg::getDefaultParameters(bool range) const
{
std::vector<eis::Range> out;
diff --git a/eisgenerator/componant/cap.h b/eisgenerator/componant/cap.h
index 31038c2..7483e11 100644
--- a/eisgenerator/componant/cap.h
+++ b/eisgenerator/componant/cap.h
@@ -19,7 +19,7 @@ public:
virtual std::string componantName() const override {return "Capacitor";}
virtual std::string getCode(std::vector<std::string>& parameters) override;
virtual std::string getTorchScript(std::vector<std::string>& parameters) override;
- virtual std::vector<eis::Range> getDefaultRange(bool range = true) const override;
+ virtual std::vector<eis::Range> getDefaultParameters(bool range = true) const override;
virtual ~Cap() = default;
};
diff --git a/eisgenerator/componant/componant.h b/eisgenerator/componant/componant.h
index 93e33e0..b14b93f 100644
--- a/eisgenerator/componant/componant.h
+++ b/eisgenerator/componant/componant.h
@@ -26,7 +26,7 @@ class Componant
virtual void setParamRanges(const std::vector<eis::Range>& ranges);
virtual std::vector<eis::Range>& getParamRanges();
virtual std::vector<eis::Range> getParamRanges() const;
- virtual std::vector<eis::Range> getDefaultRange(bool range = true) const;
+ virtual std::vector<eis::Range> getDefaultParameters(bool range = true) const;
virtual size_t paramCount() const {return 0;};
virtual ~Componant() = default;
virtual char getComponantChar() const = 0;
diff --git a/eisgenerator/componant/constantphase.h b/eisgenerator/componant/constantphase.h
index e4252f5..766006d 100644
--- a/eisgenerator/componant/constantphase.h
+++ b/eisgenerator/componant/constantphase.h
@@ -21,7 +21,7 @@ public:
static constexpr char staticGetComponantChar(){return 'p';}
virtual std::string componantName() const override {return "ConstantPhase";}
virtual ~Cpe() = default;
- virtual std::vector<eis::Range> getDefaultRange(bool range = true) const override;
+ virtual std::vector<eis::Range> getDefaultParameters(bool range = true) const override;
virtual std::string getCode(std::vector<std::string>& parameters) override;
virtual std::string getTorchScript(std::vector<std::string>& parameters) override;
};
diff --git a/eisgenerator/componant/finitetr.h b/eisgenerator/componant/finitetr.h
index dfd4277..2aaf03c 100644
--- a/eisgenerator/componant/finitetr.h
+++ b/eisgenerator/componant/finitetr.h
@@ -22,7 +22,7 @@ public:
FiniteTransmitionline(const FiniteTransmitionline& in);
virtual std::complex<fvalue> execute(fvalue omega) override;
virtual size_t paramCount() const override;
- virtual std::vector<eis::Range> getDefaultRange(bool range = true) const override;
+ virtual std::vector<eis::Range> getDefaultParameters(bool range = true) const override;
virtual ~FiniteTransmitionline();
virtual char getComponantChar() const override;
virtual std::string componantName() const override {return "FiniteTransmitionline";}
diff --git a/eisgenerator/componant/inductor.h b/eisgenerator/componant/inductor.h
index e4afd6c..3f3663a 100644
--- a/eisgenerator/componant/inductor.h
+++ b/eisgenerator/componant/inductor.h
@@ -18,7 +18,7 @@ public:
static constexpr char staticGetComponantChar(){return 'l';}
virtual std::string componantName() const override {return "Inductor";}
virtual std::string getCode(std::vector<std::string>& parameters) override;
- virtual std::vector<eis::Range> getDefaultRange(bool range = true) const override;
+ virtual std::vector<eis::Range> getDefaultParameters(bool range = true) const override;
virtual std::string getTorchScript(std::vector<std::string>& parameters) override;
virtual ~Inductor() = default;
};
diff --git a/eisgenerator/componant/resistor.h b/eisgenerator/componant/resistor.h
index 2657534..a5def55 100644
--- a/eisgenerator/componant/resistor.h
+++ b/eisgenerator/componant/resistor.h
@@ -16,7 +16,7 @@ public:
static constexpr char staticGetComponantChar(){return 'r';}
virtual std::string componantName() const override {return "Resistor";}
virtual std::string getCode(std::vector<std::string>& parameters) override;
- virtual std::vector<eis::Range> getDefaultRange(bool range = true) const override;
+ virtual std::vector<eis::Range> getDefaultParameters(bool range = true) const override;
virtual std::string getTorchScript(std::vector<std::string>& parameters) override;
virtual ~Resistor() = default;
};
diff --git a/eisgenerator/componant/warburg.h b/eisgenerator/componant/warburg.h
index 7529bf7..a0c7346 100644
--- a/eisgenerator/componant/warburg.h
+++ b/eisgenerator/componant/warburg.h
@@ -18,7 +18,7 @@ public:
static constexpr char staticGetComponantChar(){return 'w';}
virtual std::string componantName() const override {return "Warburg";}
virtual std::string getCode(std::vector<std::string>& parameters) override;
- virtual std::vector<eis::Range> getDefaultRange(bool range = true) const override;
+ virtual std::vector<eis::Range> getDefaultParameters(bool range = true) const override;
virtual std::string getTorchScript(std::vector<std::string>& parameters) override;
virtual ~Warburg() = default;
};
--
GitLab