Skip to content
Snippets Groups Projects
Commit 58bac3dc authored by Mikhail Svechnikov's avatar Mikhail Svechnikov
Browse files

FitParameterContainerItem: QVector --> std::vector

parent 6d209d7d
No related branches found
No related tags found
1 merge request!1003GUI: fix qt6 transition
...@@ -96,8 +96,7 @@ bool FitParameterContainerItem::isEmpty() ...@@ -96,8 +96,7 @@ bool FitParameterContainerItem::isEmpty()
//! Propagate values to the corresponding parameter tree items of parameterContainer. //! Propagate values to the corresponding parameter tree items of parameterContainer.
void FitParameterContainerItem::setValuesInParameterContainer( void FitParameterContainerItem::setValuesInParameterContainer(const std::vector<double> &values, ParameterContainerItem* parameterContainer)
const QVector<double>& values, ParameterContainerItem* parameterContainer)
{ {
ASSERT(parameterContainer); ASSERT(parameterContainer);
......
...@@ -61,7 +61,7 @@ public: ...@@ -61,7 +61,7 @@ public:
bool isEmpty(); bool isEmpty();
void setValuesInParameterContainer(const QVector<double>& values, void setValuesInParameterContainer(const std::vector<double>& values,
class ParameterContainerItem* parameterContainer); class ParameterContainerItem* parameterContainer);
mumufit::Parameters createParameters() const; mumufit::Parameters createParameters() const;
}; };
......
...@@ -122,8 +122,6 @@ FitObjectiveBuilder::buildSimulation(const mumufit::Parameters& params) const ...@@ -122,8 +122,6 @@ FitObjectiveBuilder::buildSimulation(const mumufit::Parameters& params) const
void FitObjectiveBuilder::update_fit_parameters(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(); auto* fitParContainer = m_jobItem->fitParameterContainerItem();
fitParContainer->setValuesInParameterContainer(values, m_jobItem->parameterContainerItem()); fitParContainer->setValuesInParameterContainer(params.values(), m_jobItem->parameterContainerItem());
} }
...@@ -160,9 +160,8 @@ void FitSessionController::updateIterationCount(const FitProgressInfo& info) ...@@ -160,9 +160,8 @@ void FitSessionController::updateIterationCount(const FitProgressInfo& info)
void FitSessionController::updateFitParameterValues(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(); FitParameterContainerItem* fitParContainer = m_jobItem->fitParameterContainerItem();
fitParContainer->setValuesInParameterContainer(values, m_jobItem->parameterContainerItem()); fitParContainer->setValuesInParameterContainer(info.parValues(), m_jobItem->parameterContainerItem());
} }
void FitSessionController::updateLog(const FitProgressInfo& info) void FitSessionController::updateLog(const FitProgressInfo& info)
...@@ -170,11 +169,10 @@ 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()); QString message = QString("NCalls:%1 chi2:%2 \n").arg(info.iterationCount()).arg(info.chi2());
FitParameterContainerItem* fitParContainer = m_jobItem->fitParameterContainerItem(); FitParameterContainerItem* fitParContainer = m_jobItem->fitParameterContainerItem();
int index(0); int index(0);
QVector<double> values = QVector<double>(info.parValues().begin(), info.parValues().end());
for (FitParameterItem* item : fitParContainer->fitParameterItems()) { for (FitParameterItem* item : fitParContainer->fitParameterItems()) {
if (item->linkItems().empty()) if (item->linkItems().empty())
continue; 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); message.append(parinfo);
} }
m_fitlog->append(message.toStdString(), FitLogLevel::Default); m_fitlog->append(message.toStdString(), FitLogLevel::Default);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment