diff --git a/GUI/Model/Job/FitParameterContainerItem.cpp b/GUI/Model/Job/FitParameterContainerItem.cpp index 515f9877bbc8eaf0b80aa86baf3066ef168c5ea7..09cf91900f058d4dbd581c5e6a3d3fcd13bf1883 100644 --- a/GUI/Model/Job/FitParameterContainerItem.cpp +++ b/GUI/Model/Job/FitParameterContainerItem.cpp @@ -96,8 +96,7 @@ bool FitParameterContainerItem::isEmpty() //! Propagate values to the corresponding parameter tree items of parameterContainer. -void FitParameterContainerItem::setValuesInParameterContainer( - const QVector<double>& values, ParameterContainerItem* parameterContainer) +void FitParameterContainerItem::setValuesInParameterContainer(const std::vector<double> &values, ParameterContainerItem* parameterContainer) { ASSERT(parameterContainer); diff --git a/GUI/Model/Job/FitParameterContainerItem.h b/GUI/Model/Job/FitParameterContainerItem.h index a888177869e29c361d4ac65244176d0025c5af9d..ce36a05eee2824dfb769e309c89389cc1a1595f2 100644 --- a/GUI/Model/Job/FitParameterContainerItem.h +++ b/GUI/Model/Job/FitParameterContainerItem.h @@ -61,7 +61,7 @@ public: bool isEmpty(); - void setValuesInParameterContainer(const QVector<double>& values, + void setValuesInParameterContainer(const std::vector<double>& values, class ParameterContainerItem* parameterContainer); mumufit::Parameters createParameters() const; }; diff --git a/GUI/View/Fit/FitObjectiveBuilder.cpp b/GUI/View/Fit/FitObjectiveBuilder.cpp index 950570d2d01b6c99badaf8567802adc31f5a66ec..aeb03cc437bb467e1abc3f0ebb7b86e2a3325238 100644 --- a/GUI/View/Fit/FitObjectiveBuilder.cpp +++ b/GUI/View/Fit/FitObjectiveBuilder.cpp @@ -122,8 +122,6 @@ FitObjectiveBuilder::buildSimulation(const mumufit::Parameters& params) const void FitObjectiveBuilder::update_fit_parameters(const mumufit::Parameters& params) const { - QVector<double> values = QVector<double>(params.values().begin(), params.values().end()); - auto* fitParContainer = m_jobItem->fitParameterContainerItem(); - fitParContainer->setValuesInParameterContainer(values, m_jobItem->parameterContainerItem()); + fitParContainer->setValuesInParameterContainer(params.values(), m_jobItem->parameterContainerItem()); } diff --git a/GUI/View/Fit/FitSessionController.cpp b/GUI/View/Fit/FitSessionController.cpp index ca08796f099acf494b2862a1db3b237fb0f60839..47e959f2aa59d60a26d08215992de2da527d0abb 100644 --- a/GUI/View/Fit/FitSessionController.cpp +++ b/GUI/View/Fit/FitSessionController.cpp @@ -160,9 +160,8 @@ void FitSessionController::updateIterationCount(const FitProgressInfo& info) void FitSessionController::updateFitParameterValues(const FitProgressInfo& info) { - QVector<double> values = QVector<double>(info.parValues().begin(), info.parValues().end()); FitParameterContainerItem* fitParContainer = m_jobItem->fitParameterContainerItem(); - fitParContainer->setValuesInParameterContainer(values, m_jobItem->parameterContainerItem()); + fitParContainer->setValuesInParameterContainer(info.parValues(), m_jobItem->parameterContainerItem()); } void FitSessionController::updateLog(const FitProgressInfo& info) @@ -170,11 +169,10 @@ void FitSessionController::updateLog(const FitProgressInfo& info) QString message = QString("NCalls:%1 chi2:%2 \n").arg(info.iterationCount()).arg(info.chi2()); FitParameterContainerItem* fitParContainer = m_jobItem->fitParameterContainerItem(); int index(0); - QVector<double> values = QVector<double>(info.parValues().begin(), info.parValues().end()); for (FitParameterItem* item : fitParContainer->fitParameterItems()) { if (item->linkItems().empty()) continue; - QString parinfo = QString(" %1 %2\n").arg(item->displayName()).arg(values[index++]); + QString parinfo = QString(" %1 %2\n").arg(item->displayName()).arg(info.parValues()[index++]); message.append(parinfo); } m_fitlog->append(message.toStdString(), FitLogLevel::Default);