diff options
| author | Thales Lima Oliveira <thaleslima.ufu@gmail.com> | 2017-05-13 16:13:12 -0300 |
|---|---|---|
| committer | Thales Lima Oliveira <thaleslima.ufu@gmail.com> | 2017-05-13 16:13:12 -0300 |
| commit | d44c3a76943c90cfcbf336961d9ba3516a1c80dc (patch) | |
| tree | c8ff066e02428c9a4f8f00e488d7495026a25b22 /Project/TransferFunction.h | |
| parent | 6cf253651521f0cdaf3a80f8ae58e9917fe2ec57 (diff) | |
| download | PSP.git-d44c3a76943c90cfcbf336961d9ba3516a1c80dc.tar.gz PSP.git-d44c3a76943c90cfcbf336961d9ba3516a1c80dc.tar.xz PSP.git-d44c3a76943c90cfcbf336961d9ba3516a1c80dc.zip | |
Several bugs fixed, ready to pull
Diffstat (limited to 'Project/TransferFunction.h')
| -rw-r--r-- | Project/TransferFunction.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Project/TransferFunction.h b/Project/TransferFunction.h index 38e31bb..19bd04e 100644 --- a/Project/TransferFunction.h +++ b/Project/TransferFunction.h @@ -33,8 +33,8 @@ class TransferFunction : public ControlElement virtual void SetDenominator(std::vector<double> denominator) { m_denominator = denominator; } virtual void UpdateTFText(); virtual SpaceState GetSpaceState() { return m_ss; } - virtual void CalculateSpaceState(double timeStep = 1e-3, double error = 1e-3); - virtual bool Solve(double input); + virtual void CalculateSpaceState(int maxIteration = 100, double error = 1e-3); + virtual bool Solve(double input, double timeStep); protected: virtual void SetText(wxString numerator, wxString denominator); @@ -53,8 +53,8 @@ class TransferFunction : public ControlElement std::vector<double> m_x; std::vector<double> m_dx; - double m_timeStep = 1e-3; double m_error = 1e-3; + int m_maxIteration = 100; }; #endif // TRANSFERFUNCTION_H |