diff --git a/GUI/Model/Job/MinimizerItem.cpp b/GUI/Model/Job/MinimizerItem.cpp index df0872c4978a23a96ba49c791f00ace857edd617..15cd127127cc6e6bc18d2d2eb400e57106473f38 100644 --- a/GUI/Model/Job/MinimizerItem.cpp +++ b/GUI/Model/Job/MinimizerItem.cpp @@ -68,10 +68,12 @@ MinimizerContainerItem::MinimizerContainerItem() addProperty<SimAnMinimizerItem>(SimAnMinimizerItem::M_TYPE); addProperty<GSLLMAMinimizerItem>(GSLLMAMinimizerItem::M_TYPE); +#ifdef ALGORITHM_LIST create_algorithm_minimizer_map(); ComboProperty common_algorithm_combo = ComboProperty::fromList(algorithm_minimizer_map.keys(), default_common_algorithm); addProperty(P_COMMON_ALGORITHMS, common_algorithm_combo.variant()); +#endif ComboProperty minimizer_combo = ComboProperty::fromList(minimizer_names_map.keys(), default_minimizer); diff --git a/GUI/Model/Job/MinimizerItem.h b/GUI/Model/Job/MinimizerItem.h index 824750862cfff4784353cf91f395a5da722903bf..a24da6649cb47585e789ec36294db6f83e657121 100644 --- a/GUI/Model/Job/MinimizerItem.h +++ b/GUI/Model/Job/MinimizerItem.h @@ -39,6 +39,8 @@ class GeneticMinimizerItem; class SimAnMinimizerItem; class GSLLMAMinimizerItem; +#define ALGORITHM_LIST + class MinimizerContainerItem : public MinimizerItem { private: static constexpr auto P_MINIMIZERS{"Minimizer"}; @@ -64,9 +66,10 @@ public: void setCurrentMinimizer(const QString& name); ComboProperty minimizerCombo() const; +#ifdef ALGORITHM_LIST void setCurrentCommonAlgorithm(const QString& name); ComboProperty commonAlgorithmCombo() const; - +#endif // Objective metric to use for estimating distance between simulated and experimental data QString currentObjectiveMetric() const; diff --git a/GUI/View/Fit/MinimizerSettingsWidget.cpp b/GUI/View/Fit/MinimizerSettingsWidget.cpp index 6c81849647daea8b203644112f99f815a6d4e8e7..50d4942d1cd1bea1ae050e18e053c41bfa001ba9 100644 --- a/GUI/View/Fit/MinimizerSettingsWidget.cpp +++ b/GUI/View/Fit/MinimizerSettingsWidget.cpp @@ -55,6 +55,7 @@ void MinimizerSettingsWidget::setMinItem(MinimizerContainerItem* minimizerItem) if (!m_currentItem) return; +#ifdef ALGORITHM_LIST m_mainLayout->addRow("Minimizer:", GUI::Util::createComboBox([=] { return m_currentItem->minimizerCombo(); }, [=](const QString& t) { @@ -62,6 +63,15 @@ void MinimizerSettingsWidget::setMinItem(MinimizerContainerItem* minimizerItem) createMimimizerEdits(); }, &m_updaters)); +#else + m_mainLayout->addRow("Minimizer:", + GUI::Util::createComboBox([=] { return m_currentItem->minimizerCombo(); }, + [=](const QString& t) { + m_currentItem->setCurrentMinimizer(t); + createMimimizerEdits(); + }, + &m_updaters)); +#endif auto* w = new QWidget(this); m_minimizerLayout = new QFormLayout(w);