From 53165d61725a55ab40fbdc91eb1ea531085ac579 Mon Sep 17 00:00:00 2001 From: Alan Garny Date: Mon, 21 Oct 2019 14:37:55 +1300 Subject: [PATCH] Some minor cleaning up. --- .../dataStore/DataStore/src/datastorepythonwrapper.cpp | 8 +++++--- .../dataStore/DataStore/src/datastorepythonwrapper.h | 9 +++++---- ...simulationexperimentviewinformationparameterswidget.h | 2 +- src/plugins/solver/CVODESolver/src/cvodesolver.cpp | 3 +-- src/plugins/solver/CVODESolver/src/cvodesolver.h | 3 +-- src/plugins/solverinterface.cpp | 3 +-- src/plugins/solverinterface.h | 3 +-- src/plugins/support/SimulationSupport/src/simulation.cpp | 2 +- src/plugins/support/SimulationSupport/src/simulation.h | 5 +++-- .../widget/GraphPanelWidget/src/graphpanelplotwidget.cpp | 3 +-- .../widget/GraphPanelWidget/src/graphpanelplotwidget.h | 2 +- 11 files changed, 21 insertions(+), 22 deletions(-) diff --git a/src/plugins/dataStore/DataStore/src/datastorepythonwrapper.cpp b/src/plugins/dataStore/DataStore/src/datastorepythonwrapper.cpp index dc5218b391..f6f3c59111 100644 --- 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 index 33cd6de4d4..779b72c311 100644 --- a/src/plugins/dataStore/DataStore/src/datastorepythonwrapper.h +++ b/src/plugins/dataStore/DataStore/src/datastorepythonwrapper.h @@ -51,7 +51,7 @@ 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); @@ -59,10 +59,10 @@ class DataStorePythonWrapper : public QObject 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/src/plugins/simulation/SimulationExperimentView/src/simulationexperimentviewinformationparameterswidget.h b/src/plugins/simulation/SimulationExperimentView/src/simulationexperimentviewinformationparameterswidget.h index 0ea2d50e01..35a4b77f16 100644 --- a/src/plugins/simulation/SimulationExperimentView/src/simulationexperimentviewinformationparameterswidget.h +++ b/src/plugins/simulation/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 index 3762e796c2..eb1fa8c1ae 100644 --- 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 index f669ebcc3a..923273b263 100644 --- 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 index ee5f4fd880..0c7e0ae8b0 100644 --- 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 index 7332517f12..7817bbe0f6 100644 --- 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 index 81645ea84f..ff797b3b7b 100644 --- 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 index 42729e7c98..8f9bbb4be7 100644 --- 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 index 4782157109..cb836389d1 100644 --- 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 index fd3500c9f7..b92fc64e09 100644 --- 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);