|
|
|
@ -895,7 +895,7 @@ void nmWxAutomaticFitting::setupControlPanel()
|
|
|
|
QLabel* algorithmLabel = new QLabel(tr("Algorithm:"));
|
|
|
|
QLabel* algorithmLabel = new QLabel(tr("Algorithm:"));
|
|
|
|
m_algorithmCombo = new QComboBox();
|
|
|
|
m_algorithmCombo = new QComboBox();
|
|
|
|
m_algorithmCombo->addItem(tr("PSO (Particle Swarm)"));
|
|
|
|
m_algorithmCombo->addItem(tr("PSO (Particle Swarm)"));
|
|
|
|
m_algorithmCombo->addItem(tr("Finite Difference + LM"));
|
|
|
|
m_algorithmCombo->addItem(tr("LM"));
|
|
|
|
m_algorithmCombo->setCurrentIndex(0);
|
|
|
|
m_algorithmCombo->setCurrentIndex(0);
|
|
|
|
m_algorithmCombo->setMaximumWidth(160);
|
|
|
|
m_algorithmCombo->setMaximumWidth(160);
|
|
|
|
m_algorithmCombo->setMinimumWidth(160);
|
|
|
|
m_algorithmCombo->setMinimumWidth(160);
|
|
|
|
@ -1454,7 +1454,7 @@ void nmWxAutomaticFitting::startAutoFitting(const QVector<QVector<double>>& targ
|
|
|
|
|
|
|
|
|
|
|
|
const bool useLM = m_algorithmCombo && m_algorithmCombo->currentIndex() == 1;
|
|
|
|
const bool useLM = m_algorithmCombo && m_algorithmCombo->currentIndex() == 1;
|
|
|
|
if(useLM) {
|
|
|
|
if(useLM) {
|
|
|
|
DEBUG_UI("Creating finite difference + LM auto fitter");
|
|
|
|
DEBUG_UI("Creating LM auto fitter");
|
|
|
|
m_autoFitterLM = new nmCalculationAutoFitLM(this);
|
|
|
|
m_autoFitterLM = new nmCalculationAutoFitLM(this);
|
|
|
|
m_autoFitterLM->setTargetLogLogData(targetData);
|
|
|
|
m_autoFitterLM->setTargetLogLogData(targetData);
|
|
|
|
m_autoFitterLM->setTargetWellName(targetWellName);
|
|
|
|
m_autoFitterLM->setTargetWellName(targetWellName);
|
|
|
|
|