Simulation support: added ode_solver_property() and nla_solver_proper…

…ty() as Python wrappers to our SimulationData class (#2178).
opencor · Dec 11, 2019 · f7b5c42 · f7b5c42
1 parent 2ae3ee0
commit f7b5c42
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 0 deletions.
diff --git a/src/plugins/support/SimulationSupport/src/simulation.cpp b/src/plugins/support/SimulationSupport/src/simulation.cpp
@@ -403,6 +403,17 @@ Solver::Solver::Properties SimulationData::odeSolverProperties() const
 
 //==============================================================================
 
+QVariant SimulationData::odeSolverProperty(const QString &pName) const
+{
+    // Return the value of the given ODE solver property
+
+    return (mSimulation->runtime() != nullptr)?
+                mOdeSolverProperties.value(pName):
+                QVariant();
+}
+
+//==============================================================================
+
 void SimulationData::setOdeSolverProperty(const QString &pName,
                                           const QVariant &pValue)
 {
@@ -472,6 +483,17 @@ Solver::Solver::Properties SimulationData::nlaSolverProperties() const
 
 //==============================================================================
 
+QVariant SimulationData::nlaSolverProperty(const QString &pName) const
+{
+    // Return the value of the given NLA solver property
+
+    return (mSimulation->runtime() != nullptr)?
+                mNlaSolverProperties.value(pName):
+                QVariant();
+}
+
+//==============================================================================
+
 void SimulationData::setNlaSolverProperty(const QString &pName,
                                           const QVariant &pValue, bool pReset)
 {

diff --git a/src/plugins/support/SimulationSupport/src/simulation.h b/src/plugins/support/SimulationSupport/src/simulation.h
@@ -234,7 +234,10 @@ public slots:
     Solver::Solver::Properties odeSolverProperties() const;
     Solver::Solver::Properties nlaSolverProperties() const;
 
+    QVariant odeSolverProperty(const QString &pName) const;
     void setOdeSolverProperty(const QString &pName, const QVariant &pValue);
+
+    QVariant nlaSolverProperty(const QString &pName) const;
     void setNlaSolverProperty(const QString &pName, const QVariant &pValue,
                               bool pReset = true);
 

diff --git a/src/plugins/support/SimulationSupport/src/simulationsupportpythonwrapper.cpp b/src/plugins/support/SimulationSupport/src/simulationsupportpythonwrapper.cpp
@@ -438,6 +438,16 @@ void SimulationSupportPythonWrapper::set_ode_solver(SimulationData *pSimulationD
 
 //==============================================================================
 
+QVariant SimulationSupportPythonWrapper::ode_solver_property(SimulationData *pSimulationData,
+                                                             const QString &pName)
+{
+    // Return the value for the given ODE solver property
+
+    return pSimulationData->odeSolverProperty(pName);
+}
+
+//==============================================================================
+
 void SimulationSupportPythonWrapper::set_ode_solver_property(SimulationData *pSimulationData,
                                                              const QString &pName,
                                                              const QVariant &pValue)
@@ -450,6 +460,16 @@ void SimulationSupportPythonWrapper::set_ode_solver_property(SimulationData *pSi
 
 //==============================================================================
 
+QVariant SimulationSupportPythonWrapper::nla_solver_property(SimulationData *pSimulationData,
+                                                             const QString &pName)
+{
+    // Return the value for the given NLA solver property
+
+    return pSimulationData->nlaSolverProperty(pName);
+}
+
+//==============================================================================
+
 QString SimulationSupportPythonWrapper::nla_solver_name(SimulationData *pSimulationData)
 {
     // Return the name of the NLA solver for the given simulation data

diff --git a/src/plugins/support/SimulationSupport/src/simulationsupportpythonwrapper.h b/src/plugins/support/SimulationSupport/src/simulationsupportpythonwrapper.h
@@ -94,12 +94,18 @@ public slots:
     QString ode_solver_name(OpenCOR::SimulationSupport::SimulationData *pSimulationData);
     void set_ode_solver(OpenCOR::SimulationSupport::SimulationData *pSimulationData,
                         const QString &pName);
+
+    QVariant ode_solver_property(OpenCOR::SimulationSupport::SimulationData *pSimulationData,
+                                 const QString &pName);
     void set_ode_solver_property(OpenCOR::SimulationSupport::SimulationData *pSimulationData,
                                  const QString &pName, const QVariant &pValue);
 
     QString nla_solver_name(OpenCOR::SimulationSupport::SimulationData *pSimulationData);
     void set_nla_solver(OpenCOR::SimulationSupport::SimulationData *pSimulationData,
                         const QString &pName);
+
+    QVariant nla_solver_property(OpenCOR::SimulationSupport::SimulationData *pSimulationData,
+                                 const QString &pName);
     void set_nla_solver_property(OpenCOR::SimulationSupport::SimulationData *pSimulationData,
                                  const QString &pName, const QVariant &pValue);