Some minor cleaning up.

opencor · Oct 21, 2019 · 53165d6 · 53165d6
1 parent 3286db2
commit 53165d6
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 22 deletions.
diff --git a/src/plugins/dataStore/DataStore/src/datastorepythonwrapper.cpp b/src/plugins/dataStore/DataStore/src/datastorepythonwrapper.cpp
@@ -313,7 +313,8 @@ PyObject * DataStorePythonWrapper::newNumPyArray(DataStoreArray *pDataStoreArray
 
 //==============================================================================
 
-PyObject * DataStorePythonWrapper::newNumPyArray(DataStoreVariable *pDataStoreVariable, const int &pRun)
+PyObject * DataStorePythonWrapper::newNumPyArray(DataStoreVariable *pDataStoreVariable,
+                                                 int pRun)
 {
     if (pDataStoreVariable && pDataStoreVariable->array(pRun)) {
         auto numpyArray = new NumpyPythonWrapper(pDataStoreVariable->array(pRun), pDataStoreVariable->size());
@@ -328,7 +329,7 @@ PyObject * DataStorePythonWrapper::newNumPyArray(DataStoreVariable *pDataStoreVa
 //==============================================================================
 
 double DataStorePythonWrapper::value(DataStoreVariable *pDataStoreVariable,
-                                     const quint64 &pPosition, const int &pRun) const
+                                     const quint64 &pPosition, int pRun) const
 {
     if (pDataStoreVariable && pDataStoreVariable->array()) {
         return pDataStoreVariable->value(pPosition, pRun);
@@ -339,7 +340,8 @@ double DataStorePythonWrapper::value(DataStoreVariable *pDataStoreVariable,
 
 //==============================================================================
 
-PyObject * DataStorePythonWrapper::values(DataStoreVariable *pDataStoreVariable, const int &pRun) const
+PyObject * DataStorePythonWrapper::values(DataStoreVariable *pDataStoreVariable,
+                                          int pRun) const
 {
     return DataStorePythonWrapper::newNumPyArray(pDataStoreVariable, pRun);
 }

diff --git a/src/plugins/dataStore/DataStore/src/datastorepythonwrapper.h b/src/plugins/dataStore/DataStore/src/datastorepythonwrapper.h
@@ -51,18 +51,18 @@ class DataStorePythonWrapper : public QObject
 
     static DATASTORE_EXPORT PyObject * newNumPyArray(DataStoreArray *pDataStoreArray);
     static DATASTORE_EXPORT PyObject * newNumPyArray(DataStoreVariable *pDataStoreVariable,
-                                                     const int &pRun);
+                                                     int pRun = -1);
 
     static DATASTORE_EXPORT PyObject *dataStoreValuesDict(const DataStoreValues *pDataStoreValues,
                                                           SimulationSupport::SimulationDataUpdatedFunction *pSimulationDataUpdatedFunction = nullptr);
     static DATASTORE_EXPORT PyObject *dataStoreVariablesDict(const DataStoreVariables &pDataStoreVariables);
 
 public slots:
     double value(OpenCOR::DataStore::DataStoreVariable *pDataStoreVariable,
-                 const quint64 &pPosition, const int &pRun = -1) const;
+                 const quint64 &pPosition, int pRun = -1) const;
 
     PyObject * values(OpenCOR::DataStore::DataStoreVariable *pDataStoreVariable,
-                      const int &pRun = -1) const;
+                      int pRun = -1) const;
 
     PyObject * variables(OpenCOR::DataStore::DataStore *pDataStore);
     PyObject * voiAndVariables(OpenCOR::DataStore::DataStore *pDataStore);
@@ -75,7 +75,8 @@ class NumpyPythonWrapper : public QObject
     Q_OBJECT
 
 public:
-    explicit NumpyPythonWrapper(DataStoreArray *pDataStoreArray, quint64 pSize=0);
+    explicit NumpyPythonWrapper(DataStoreArray *pDataStoreArray,
+                                quint64 pSize = 0);
     ~NumpyPythonWrapper();
 
     PyObject * numpyArray() const;

diff --git a/...lation/SimulationExperimentView/src/simulationexperimentviewinformationparameterswidget.h b/...lation/SimulationExperimentView/src/simulationexperimentviewinformationparameterswidget.h
@@ -108,7 +108,7 @@ class SimulationExperimentViewInformationParametersWidget : public Core::Propert
     void graphRequired(CellMLSupport::CellmlFileRuntimeParameter *pParameterX,
                        CellMLSupport::CellmlFileRuntimeParameter *pParameterY);
 
-    void calculateGradients(const int &pIndex, const bool &pCalculate);
+    void calculateGradients(int pIndex, bool pCalculate);
 
 public slots:
     void updateParameters(double pCurrentPoint);

diff --git a/src/plugins/solver/CVODESolver/src/cvodesolver.cpp b/src/plugins/solver/CVODESolver/src/cvodesolver.cpp
@@ -153,8 +153,7 @@ void CvodeSolver::initialize(double pVoi, int pRatesStatesCount,
                              double *pConstants, double *pRates,
                              double *pStates, double *pAlgebraic,
                              ComputeRatesFunction pComputeRates,
-                             const int &pGradientsCount,
-                             int *pGradientsIndices,
+                             int pGradientsCount, int *pGradientsIndices,
                              double *pGradients)
 {
     // Retrieve our properties

diff --git a/src/plugins/solver/CVODESolver/src/cvodesolver.h b/src/plugins/solver/CVODESolver/src/cvodesolver.h
@@ -143,8 +143,7 @@ class CvodeSolver : public OpenCOR::Solver::OdeSolver
     void initialize(double pVoi, int pRatesStatesCount, double *pConstants,
                     double *pRates, double *pStates, double *pAlgebraic,
                     ComputeRatesFunction pComputeRates,
-                    const int &pGradientsCount,
-                    int *pGradientsIndices,
+                    int pGradientsCount, int *pGradientsIndices,
                     double *pGradients) override;
     void reinitialize(double pVoi) override;
 

diff --git a/src/plugins/solverinterface.cpp b/src/plugins/solverinterface.cpp
@@ -126,8 +126,7 @@ void OdeSolver::initialize(double pVoi, int pRatesStatesCount,
                            double *pConstants, double *pRates, double *pStates,
                            double *pAlgebraic,
                            ComputeRatesFunction pComputeRates,
-                           const int &pGradientsCount,
-                           int *pGradientsIndices,
+                           int pGradientsCount, int *pGradientsIndices,
                            double *pGradients)
 {
     Q_UNUSED(pGradientsCount);

diff --git a/src/plugins/solverinterface.h b/src/plugins/solverinterface.h
@@ -85,8 +85,7 @@ class OdeSolver : public Solver
                             double *pConstants, double *pRates, double *pStates,
                             double *pAlgebraic,
                             ComputeRatesFunction pComputeRates,
-                            const int &pGradientsCount,
-                            int *pGradientsIndices,
+                            int pGradientsCount, int *pGradientsIndices,
                             double *pGradients);
 
     virtual void reinitialize(double pVoi);

diff --git a/src/plugins/support/SimulationSupport/src/simulation.cpp b/src/plugins/support/SimulationSupport/src/simulation.cpp
@@ -789,7 +789,7 @@ void SimulationData::deleteArrays()
 
 //==============================================================================
 
-void SimulationData::setGradientCalculationByIndex(const int &pIndex, bool pCalculate)
+void SimulationData::setGradientCalculationByIndex(int pIndex, bool pCalculate)
 {
     // Keep track of the indices of constant parameters that will
     // have gradients calculated

diff --git a/src/plugins/support/SimulationSupport/src/simulation.h b/src/plugins/support/SimulationSupport/src/simulation.h
@@ -205,8 +205,9 @@ public slots:
     bool isModified() const;
     void checkForModifications();
 
-    void setGradientCalculation(const QString &pConstantUri, bool pCalculate = true);
-    void setGradientCalculationByIndex(const int &pIndex, bool pCalculate);
+    void setGradientCalculation(const QString &pConstantUri,
+                                bool pCalculate = true);
+    void setGradientCalculationByIndex(int pIndex, bool pCalculate);
 
     void updateInitialValues();
 

diff --git a/src/plugins/widget/GraphPanelWidget/src/graphpanelplotwidget.cpp b/src/plugins/widget/GraphPanelWidget/src/graphpanelplotwidget.cpp
@@ -2764,8 +2764,7 @@ bool GraphPanelPlotWidget::isOptimizedAxes() const
 
 //==============================================================================
 
-void GraphPanelPlotWidget::optimizeAxis(const int &pAxisId, double &pMin,
-                                        double &pMax,
+void GraphPanelPlotWidget::optimizeAxis(int pAxisId, double &pMin, double &pMax,
                                         Optimization pOptimization)
 {
     // Make sure that the given values are different (and therefore optimisable

diff --git a/src/plugins/widget/GraphPanelWidget/src/graphpanelplotwidget.h b/src/plugins/widget/GraphPanelWidget/src/graphpanelplotwidget.h
@@ -656,7 +656,7 @@ class GRAPHPANELWIDGET_EXPORT GraphPanelPlotWidget : public QwtPlot,
 
     QRectF realDataRect();
 
-    void optimizeAxis(const int &pAxisId, double &pMin, double &pMax,
+    void optimizeAxis(int pAxisId, double &pMin, double &pMax,
                       Optimization pOptimization);
 
     void setAxis(int pAxisId, double pMin, double pMax);