diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-18 18:13:30 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-18 18:13:30 -0600 |
commit | abb8cd68f820cfe0c96965136890a6bdd1093db5 (patch) | |
tree | 0ccc113047cebed06b5bd61adeadab4330b7d4a0 /src/electronics/simulation | |
parent | c1ef065782051db96cdfd32cf55be6408c2a9d22 (diff) | |
download | ktechlab-abb8cd68f820cfe0c96965136890a6bdd1093db5.tar.gz ktechlab-abb8cd68f820cfe0c96965136890a6bdd1093db5.zip |
Rename old tq methods that no longer need a unique name
Diffstat (limited to 'src/electronics/simulation')
-rw-r--r-- | src/electronics/simulation/capacitance.cpp | 6 | ||||
-rw-r--r-- | src/electronics/simulation/capacitance.h | 2 | ||||
-rw-r--r-- | src/electronics/simulation/element.cpp | 8 | ||||
-rw-r--r-- | src/electronics/simulation/element.h | 2 | ||||
-rw-r--r-- | src/electronics/simulation/inductance.cpp | 6 | ||||
-rw-r--r-- | src/electronics/simulation/inductance.h | 2 | ||||
-rw-r--r-- | src/electronics/simulation/reactive.cpp | 6 | ||||
-rw-r--r-- | src/electronics/simulation/reactive.h | 2 |
8 files changed, 17 insertions, 17 deletions
diff --git a/src/electronics/simulation/capacitance.cpp b/src/electronics/simulation/capacitance.cpp index c289f90..9087c7f 100644 --- a/src/electronics/simulation/capacitance.cpp +++ b/src/electronics/simulation/capacitance.cpp @@ -101,9 +101,9 @@ void Capacitance::time_step() i_eq_old = i_eq_new; } -bool Capacitance::updatetqStatus() +bool Capacitance::updateStatus() { - b_status = Reactive::updatetqStatus(); + b_status = Reactive::updateStatus(); if ( m_method == Capacitance::m_none ) b_status = false; return b_status; } @@ -111,7 +111,7 @@ bool Capacitance::updatetqStatus() void Capacitance::setMethod( Method m ) { m_method = m; - updatetqStatus(); + updateStatus(); } diff --git a/src/electronics/simulation/capacitance.h b/src/electronics/simulation/capacitance.h index b26899c..ccc083d 100644 --- a/src/electronics/simulation/capacitance.h +++ b/src/electronics/simulation/capacitance.h @@ -42,7 +42,7 @@ public: protected: virtual void updateCurrents(); - virtual bool updatetqStatus(); + virtual bool updateStatus(); private: double m_cap; // Capacitance diff --git a/src/electronics/simulation/element.cpp b/src/electronics/simulation/element.cpp index dbcd02d..2411897 100644 --- a/src/electronics/simulation/element.cpp +++ b/src/electronics/simulation/element.cpp @@ -55,7 +55,7 @@ void Element::setElementSet( ElementSet *c ) p_eSet = c; p_A = p_eSet->matrix(); p_b = p_eSet->b(); - updatetqStatus(); + updateStatus(); } void Element::componentDeleted() @@ -113,7 +113,7 @@ void Element::setCNodes( const int n0, const int n1, const int n2, const int n3 p_cnode[1] = (n1>-1)?p_eSet->cnodes()[n1]:(n1==-1?p_eSet->ground():0l); p_cnode[2] = (n2>-1)?p_eSet->cnodes()[n2]:(n2==-1?p_eSet->ground():0l); p_cnode[3] = (n3>-1)?p_eSet->cnodes()[n3]:(n3==-1?p_eSet->ground():0l); - updatetqStatus(); + updateStatus(); } void Element::setCBranches( const int b0, const int b1, const int b2, const int b3 ) @@ -128,10 +128,10 @@ void Element::setCBranches( const int b0, const int b1, const int b2, const int p_cbranch[1] = (b1>-1)?p_eSet->cbranches()[b1]:0l; p_cbranch[2] = (b2>-1)?p_eSet->cbranches()[b2]:0l; p_cbranch[3] = (b3>-1)?p_eSet->cbranches()[b3]:0l; - updatetqStatus(); + updateStatus(); } -bool Element::updatetqStatus() +bool Element::updateStatus() { // First, set status to false if all nodes in use are ground b_status = false; diff --git a/src/electronics/simulation/element.h b/src/electronics/simulation/element.h index 7b219c9..e05de46 100644 --- a/src/electronics/simulation/element.h +++ b/src/electronics/simulation/element.h @@ -188,7 +188,7 @@ protected: /** * Update the status, returning b_status */ - virtual bool updatetqStatus(); + virtual bool updateStatus(); /** * Set by child class - the number of branches that the element uses * Typically, this is 0, but could be 1 (e.g. independent voltage source) diff --git a/src/electronics/simulation/inductance.cpp b/src/electronics/simulation/inductance.cpp index 6737ab6..22c5f9e 100644 --- a/src/electronics/simulation/inductance.cpp +++ b/src/electronics/simulation/inductance.cpp @@ -109,9 +109,9 @@ void Inductance::time_step() } -bool Inductance::updatetqStatus() +bool Inductance::updateStatus() { - b_status = Reactive::updatetqStatus(); + b_status = Reactive::updateStatus(); if ( m_method == Inductance::m_none ) b_status = false; return b_status; @@ -121,6 +121,6 @@ bool Inductance::updatetqStatus() void Inductance::setMethod( Method m ) { m_method = m; - updatetqStatus(); + updateStatus(); } diff --git a/src/electronics/simulation/inductance.h b/src/electronics/simulation/inductance.h index e4bd119..46ccb09 100644 --- a/src/electronics/simulation/inductance.h +++ b/src/electronics/simulation/inductance.h @@ -42,7 +42,7 @@ class Inductance : public Reactive protected: virtual void updateCurrents(); - virtual bool updatetqStatus(); + virtual bool updateStatus(); private: double m_inductance; // Inductance diff --git a/src/electronics/simulation/reactive.cpp b/src/electronics/simulation/reactive.cpp index c753f42..83fcfd4 100644 --- a/src/electronics/simulation/reactive.cpp +++ b/src/electronics/simulation/reactive.cpp @@ -26,11 +26,11 @@ Reactive::~Reactive() void Reactive::setDelta( double delta ) { m_delta = delta; - updatetqStatus(); + updateStatus(); } -bool Reactive::updatetqStatus() +bool Reactive::updateStatus() { - return Element::updatetqStatus(); + return Element::updateStatus(); } diff --git a/src/electronics/simulation/reactive.h b/src/electronics/simulation/reactive.h index a93459b..1142b34 100644 --- a/src/electronics/simulation/reactive.h +++ b/src/electronics/simulation/reactive.h @@ -34,7 +34,7 @@ public: virtual void time_step() = 0; protected: - virtual bool updatetqStatus(); + virtual bool updateStatus(); double m_delta; // Delta time interval }; |