From dbe0b112622f8e91fa3e44a6b6e1aa7e230d3ded Mon Sep 17 00:00:00 2001 From: Thales Lima Oliveira Date: Sun, 31 Dec 2017 17:59:10 -0200 Subject: Math Expression implemented --- Project/ControlElementSolver.h | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'Project/ControlElementSolver.h') diff --git a/Project/ControlElementSolver.h b/Project/ControlElementSolver.h index 5717b08..f24f740 100644 --- a/Project/ControlElementSolver.h +++ b/Project/ControlElementSolver.h @@ -58,6 +58,7 @@ class ControlElementSolver virtual double GetLastSolution() { return m_solutions[m_solutions.size() - 1]; } virtual bool IsOK() const { return m_isOK; } virtual wxString GetErrorMessage() { return m_failMessage; } + void SetSwitchStatus(bool value) { m_switchStatus = value; } void SetCurrentTime(double value) { m_currentTime = value; } void SetTerminalVoltage(double value) { m_terminalVoltage = value; } void SetVelocity(double value) { m_velocity = value; } @@ -87,6 +88,7 @@ class ControlElementSolver IOControl* m_inputControl = NULL; /**< First input control to be solved */ IOControl* m_outputControl = NULL; // Inputs + bool m_switchStatus = false; double m_currentTime = 0.0; double m_terminalVoltage = 0.0; double m_velocity = 0.0; @@ -97,6 +99,13 @@ class ControlElementSolver double m_initVelocity = 0.0; double m_deltaVelocity = 0.0; double m_deltaPe = 0.0; + + /* + * m_inputToSolve[0] = Current line value; + * m_inputToSolve[1] = Current time; + * m_inputToSolve[2] = Switch status. + */ + double* m_inputToSolve = NULL; // Outputs double m_fieldVoltage = 0.0; double m_mecPower = 0.0; -- cgit