rm ALGORITHM_LIST

GUI/Model/Job/MinimizerItem.cpp

@@ -32,7 +32,6 @@ const QMap<QString, QString> minimizer_names_map = {
     {"GSL Levenberg-Marquardt", GSLLMAMinimizerItem::M_TYPE}};
 const QString default_minimizer = minimizer_names_map.key(MinuitMinimizerItem::M_TYPE);
 
-#ifdef ALGORITHM_LIST
 QMap<QString /*algorithm*/, QString /*minimizer*/> algorithm_minimizer_map;
 void add_algorithm_from_minimizer_to_list_and_map(const QString& minimizer,
                                                   QStringList& common_algorithms_list,
@@ -92,7 +91,6 @@ void create_algorithm_list_and_map(QString& default_common_algorithm, QStringLis
 
     default_common_algorithm = algorithms_list[1]; // after the first header: Minuit2 Migrad
 }
-#endif
 
 } // namespace
 
@@ -113,7 +111,6 @@ MinimizerContainerItem::MinimizerContainerItem()
     addProperty<SimAnMinimizerItem>(SimAnMinimizerItem::M_TYPE);
     addProperty<GSLLMAMinimizerItem>(GSLLMAMinimizerItem::M_TYPE);
 
-#ifdef ALGORITHM_LIST
     QString default_common_algorithm;
     QStringList common_algorithms_list;
     QStringList common_algorithms_descriptions;
@@ -123,7 +120,6 @@ MinimizerContainerItem::MinimizerContainerItem()
         ComboProperty::fromList(common_algorithms_list, default_common_algorithm);
     common_algorithm_combo.setToolTips(common_algorithms_descriptions);
     addProperty(P_COMMON_ALGORITHMS, common_algorithm_combo.variant());
-#endif
 
     ComboProperty minimizer_combo =
         ComboProperty::fromList(minimizer_names_map.keys(), default_minimizer);
@@ -190,7 +186,7 @@ ComboProperty MinimizerContainerItem::minimizerCombo() const
 {
     return getItemValue(P_MINIMIZERS).value<ComboProperty>();
 }
-#ifdef ALGORITHM_LIST
+
 bool MinimizerContainerItem::algorithmHasMinimizer(const QString& name)
 {
     return algorithm_minimizer_map.contains(name);
@@ -231,7 +227,7 @@ void MinimizerContainerItem::applyAlgorithmToMinimizer(const QString& name)
     // GSL Levenberg-Marquardt
     // do nothing
 }
-#endif
+
 QString MinimizerContainerItem::currentObjectiveMetric() const
 {
     return objectiveMetricCombo().currentValue();

GUI/Model/Job/MinimizerItem.h

@@ -39,8 +39,6 @@ class GeneticMinimizerItem;
 class SimAnMinimizerItem;
 class GSLLMAMinimizerItem;
 
-#define ALGORITHM_LIST
-
 class MinimizerContainerItem : public MinimizerItem {
 private:
     static constexpr auto P_MINIMIZERS{"Minimizer"};
@@ -66,12 +64,10 @@ public:
     void setCurrentMinimizer(const QString& name);
     ComboProperty minimizerCombo() const;
 
-#ifdef ALGORITHM_LIST
     bool algorithmHasMinimizer(const QString& name);
     void setCurrentCommonAlgorithm(const QString& name);
     ComboProperty commonAlgorithmCombo() const;
     void applyAlgorithmToMinimizer(const QString& name);
-#endif
 
     // Objective metric to use for estimating distance between simulated and experimental data
     QString currentObjectiveMetric() const;

GUI/View/Fit/MinimizerSettingsWidget.cpp

@@ -55,17 +55,7 @@ void MinimizerSettingsWidget::setMinItem(MinimizerContainerItem* minimizerItem)
     if (!m_currentItem)
         return;
 
-#ifdef ALGORITHM_LIST
     createGroupedAlgorithmsCombo();
-#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);
@@ -90,7 +80,7 @@ void MinimizerSettingsWidget::setMinItem(MinimizerContainerItem* minimizerItem)
     createMimimizerEdits();
     updateUIValues();
 }
-#ifdef ALGORITHM_LIST
+
 void MinimizerSettingsWidget::createGroupedAlgorithmsCombo()
 {
     QComboBox* comboBox = new QComboBox;
@@ -161,7 +151,7 @@ void MinimizerSettingsWidget::createGroupedAlgorithmsCombo()
 
     m_mainLayout->addRow("Algorithm:", comboBox);
 }
-#endif
+
 void MinimizerSettingsWidget::createMimimizerEdits()
 {
     GUI::Util::Layout::clearLayout(m_minimizerLayout);
@@ -191,12 +181,6 @@ void MinimizerSettingsWidget::createMinuitEdits()
 {
     MinuitMinimizerItem* minItem = m_currentItem->minimizerItemMinuit();
 
-#ifndef ALGORITHM_LIST
-    m_minimizerLayout->addRow(
-        "Algorithm:", GUI::Util::createComboBox(
-                          [=] { return minItem->algorithmCombo(); },
-                          [=](const QString& t) { minItem->setCurrentAlgorithm(t); }, &m_updaters));
-#endif
     m_minimizerLayout->addRow(
         "Strategy:",
         GUI::Util::createIntSpinbox([=] { return minItem->strategy(); },
@@ -236,12 +220,6 @@ void MinimizerSettingsWidget::createGSLMultiMinEdits()
 {
     GSLMultiMinimizerItem* minItem = m_currentItem->minimizerItemGSLMulti();
 
-#ifndef ALGORITHM_LIST
-    m_minimizerLayout->addRow(
-        "Algorithm:", GUI::Util::createComboBox(
-                          [=] { return minItem->algorithmCombo(); },
-                          [=](const QString& t) { minItem->setCurrentAlgorithm(t); }, &m_updaters));
-#endif
     m_minimizerLayout->addRow(
         "Max iterations:",
         GUI::Util::createIntSpinbox([=] { return minItem->maxIterations(); },

GUI/View/Fit/MinimizerSettingsWidget.h

@@ -35,9 +35,7 @@ public slots:
     void setMinItem(MinimizerContainerItem* minimizerItem);
 
 private:
-#ifdef ALGORITHM_LIST
     void createGroupedAlgorithmsCombo();
-#endif
     void createMimimizerEdits();
     void createMinuitEdits();
     void createGSLMultiMinEdits();