Optimisation: only store gradients if we have a gradients' data store...

opencor · Aug 4, 2017 · 61e6081 · 61e6081
1 parent bb7c5da
commit 61e6081
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/...gins/simulation/SimulationExperimentView/src/simulationexperimentviewsimulationwidget.cpp b/...gins/simulation/SimulationExperimentView/src/simulationexperimentviewsimulationwidget.cpp
@@ -1297,7 +1297,7 @@ void SimulationExperimentViewSimulationWidget::runPauseResumeSimulation()
                 if (runSimulation) {
                     // Allocate additional memory for sensitivity analysis
 
-                    runSimulation = mSimulation->data()->createGradientsStore(
+                    runSimulation = mSimulation->results()->createGradientsDataStore(
                                         mContentsWidget->informationWidget()->parametersWidget()->gradientIndices());
                 }
 

diff --git a/src/plugins/support/SimulationSupport/src/simulation.cpp b/src/plugins/support/SimulationSupport/src/simulation.cpp
@@ -889,6 +889,7 @@ SimulationResults::SimulationResults(Simulation *pSimulation) :
     mSimulation(pSimulation),
     mRuntime(pSimulation->runtime()),
     mDataStore(pSimulation->data()->resultsDataStore()),
+    mGradientsDataStore(0),
     mPointVariable(pSimulation->data()->pointVariable()),
     mConstantVariables(pSimulation->data()->constantVariables()),
     mRateVariables(pSimulation->data()->rateVariables()),
@@ -956,6 +957,17 @@ void SimulationResults::deleteDataStoreArrays()
 
 //==============================================================================
 
+bool SimulationResults::createGradientsDataStore(const QSet<int> &pGradientIndices)
+{
+    bool result = mSimulation->data()->createGradientsDataStore(pGradientIndices);
+
+    mGradientsDataStore = mSimulation->data()->gradientsDataStore();
+
+    return result;
+}
+
+//==============================================================================
+
 void SimulationResults::reload()
 {
     // Update ourselves by updating our runtime and deleting our data store arrays
@@ -990,7 +1002,8 @@ void SimulationResults::addPoint(const double &pPoint)
 
     // Add sensitivity gradients to their data store
 
-    mSimulation->data()->gradientsDataStore()->addValues(pPoint);
+    if (mGradientsDataStore)
+        mGradientsDataStore->addValues(pPoint);
 }
 
 //==============================================================================

diff --git a/src/plugins/support/SimulationSupport/src/simulation.h b/src/plugins/support/SimulationSupport/src/simulation.h
@@ -108,7 +108,7 @@ class SIMULATIONSUPPORT_EXPORT SimulationData : public QObject
     DataStore::DataStoreVariables stateVariables() const;
     DataStore::DataStoreVariables algebraicVariables() const;
 
-    bool createGradientsStore(const QSet<int> &pGradientIndices);
+    bool createGradientsDataStore(const QSet<int> &pGradientIndices);
 
     double * gradients() const;
     int gradientsCount() const;
@@ -241,6 +241,8 @@ class SIMULATIONSUPPORT_EXPORT SimulationResults : public QObject
     double * rates(const int &pIndex) const;
     double * states(const int &pIndex) const;
 
+    bool createGradientsDataStore(const QSet<int> &pGradientIndices);
+
 public slots:
     bool reset(const bool &pAllocateArrays = true);
 
@@ -254,6 +256,7 @@ public slots:
     CellMLSupport::CellmlFileRuntime *mRuntime;
 
     DataStore::DataStore *mDataStore;
+    DataStore::DataStore *mGradientsDataStore;
 
     const DataStore::DataStoreVariable *mPointVariable;