clang-format

GUI/Model/Job/MinimizerItem.cpp

@@ -42,18 +42,18 @@ void add_algorithm_from_minimizer_to_list_and_map(const QString& minimizer,
     QStringList descriptions = MinimizerItemCatalog::algorithmDescriptions(minimizer);
     ASSERT(algorithms.size() == descriptions.size())
 
-    for (int i=0; i<algorithms.size(); i++) {
+    for (int i = 0; i < algorithms.size(); i++) {
         QString name = "   " + algorithms[i];
         common_algorithms_list.append(name);
         common_algorithms_descriptions.append(descriptions[i]);
         algorithm_minimizer_map.insert(name, minimizer_names_map.key(minimizer));
     }
 }
-void create_algorithm_list_and_map(QString& default_common_algorithm,
-                                   QStringList& algorithms_list,
+void create_algorithm_list_and_map(QString& default_common_algorithm, QStringList& algorithms_list,
                                    QStringList& algorithms_descriptions)
 {
-    // Group headers may not directly correspond to minimizers, so for them we don't use descriptions from MinimizerInfo
+    // Group headers may not directly correspond to minimizers, so for them we don't use
+    // descriptions from MinimizerInfo
 
     algorithms_list.clear();
     algorithms_descriptions.clear();
@@ -63,34 +63,31 @@ void create_algorithm_list_and_map(QString& default_common_algorithm,
     algorithms_list.append("ROOT Minuit2");
     algorithms_descriptions.append("Minuit2 minimizer from CERN ROOT package");
 
-    add_algorithm_from_minimizer_to_list_and_map(MinuitMinimizerItem::M_TYPE, algorithms_list, algorithms_descriptions);
+    add_algorithm_from_minimizer_to_list_and_map(MinuitMinimizerItem::M_TYPE, algorithms_list,
+                                                 algorithms_descriptions);
 
     // group 2
     algorithms_list.append("ROOT TMVA");
     algorithms_descriptions.append("Genetic minimizer from TMVA package, part of CERN ROOT ");
 
-    add_algorithm_from_minimizer_to_list_and_map(GeneticMinimizerItem::M_TYPE,
-                                                 algorithms_list,
+    add_algorithm_from_minimizer_to_list_and_map(GeneticMinimizerItem::M_TYPE, algorithms_list,
                                                  algorithms_descriptions);
 
     // group 3
     algorithms_list.append("GSL MultiMin");
     algorithms_descriptions.append("Multidimensional Minimization from GSL library");
 
-    add_algorithm_from_minimizer_to_list_and_map(GSLMultiMinimizerItem::M_TYPE,
-                                                 algorithms_list,
+    add_algorithm_from_minimizer_to_list_and_map(GSLMultiMinimizerItem::M_TYPE, algorithms_list,
                                                  algorithms_descriptions);
 
     // group 4
     algorithms_list.append("GSL");
     algorithms_descriptions.append("Other minimizers from GSL library");
 
-    add_algorithm_from_minimizer_to_list_and_map(SimAnMinimizerItem::M_TYPE,
-                                                 algorithms_list,
+    add_algorithm_from_minimizer_to_list_and_map(SimAnMinimizerItem::M_TYPE, algorithms_list,
                                                  algorithms_descriptions);
 
-    add_algorithm_from_minimizer_to_list_and_map(GSLLMAMinimizerItem::M_TYPE,
-                                                 algorithms_list,
+    add_algorithm_from_minimizer_to_list_and_map(GSLLMAMinimizerItem::M_TYPE, algorithms_list,
                                                  algorithms_descriptions);
 
     default_common_algorithm = algorithms_list[1]; // after the first header
@@ -120,8 +117,7 @@ MinimizerContainerItem::MinimizerContainerItem()
     QString default_common_algorithm;
     QStringList common_algorithms_list;
     QStringList common_algorithms_descriptions;
-    create_algorithm_list_and_map(default_common_algorithm,
-                                  common_algorithms_list,
+    create_algorithm_list_and_map(default_common_algorithm, common_algorithms_list,
                                   common_algorithms_descriptions);
     ComboProperty common_algorithm_combo =
         ComboProperty::fromList(common_algorithms_list, default_common_algorithm);
@@ -195,7 +191,7 @@ ComboProperty MinimizerContainerItem::minimizerCombo() const
     return getItemValue(P_MINIMIZERS).value<ComboProperty>();
 }
 #ifdef ALGORITHM_LIST
-bool MinimizerContainerItem::algorithmHasMinimizer(const QString &name)
+bool MinimizerContainerItem::algorithmHasMinimizer(const QString& name)
 {
     return algorithm_minimizer_map.contains(name);
 }

GUI/Util/ComboProperty.cpp

@@ -164,7 +164,7 @@ QString ComboProperty::stringOfTooltips() const
     return m_tooltips.join(value_separator);
 }
 
-void ComboProperty::setStringOfTooltips(const QString &tooltips)
+void ComboProperty::setStringOfTooltips(const QString& tooltips)
 {
     m_tooltips = tooltips.split(value_separator);
 }

GUI/View/Fit/MinimizerSettingsWidget.cpp

@@ -22,8 +22,8 @@
 #include <QComboBox>
 #include <QFormLayout>
 #include <QPushButton>
-#include <QVBoxLayout>
 #include <QStandardItemModel>
+#include <QVBoxLayout>
 
 MinimizerSettingsWidget::MinimizerSettingsWidget(QWidget* parent)
     : QWidget(parent)
@@ -99,16 +99,16 @@ void MinimizerSettingsWidget::createGroupedAlgorithmsCombo()
     // list with headers and separators
     QList<qsizetype> header_indices;
     QList<qsizetype> non_separator_indices;
-    for(QString algorithm : list) {
+    for (QString algorithm : list) {
         comboBox->addItem(algorithm);
-        if(!m_currentItem->algorithmHasMinimizer(algorithm)) {
+        if (!m_currentItem->algorithmHasMinimizer(algorithm)) {
 
-            comboBox->insertSeparator(comboBox->count()-1);
+            comboBox->insertSeparator(comboBox->count() - 1);
 
-            qsizetype header_index = comboBox->count()-1;
+            qsizetype header_index = comboBox->count() - 1;
             header_indices.append(header_index);
             non_separator_indices.append(header_index);
-            QStandardItemModel* model =	qobject_cast<QStandardItemModel*>(comboBox->model());
+            QStandardItemModel* model = qobject_cast<QStandardItemModel*>(comboBox->model());
             QStandardItem* header_item = model->item(header_index);
             header_item->setSelectable(false);
 
@@ -118,7 +118,7 @@ void MinimizerSettingsWidget::createGroupedAlgorithmsCombo()
 
             comboBox->insertSeparator(comboBox->count());
         } else
-            non_separator_indices.append(comboBox->count()-1);
+            non_separator_indices.append(comboBox->count() - 1);
     }
     comboBox->setCurrentText(m_currentItem->commonAlgorithmCombo().currentValue());
 
@@ -133,16 +133,15 @@ void MinimizerSettingsWidget::createGroupedAlgorithmsCombo()
     comboBox->setProperty("previous", comboBox->currentIndex());
     QObject::connect(comboBox, &QComboBox::currentTextChanged, [=] {
         // skip headers while scrolling
-        if(header_indices.contains(comboBox->currentIndex()))
-        {
+        if (header_indices.contains(comboBox->currentIndex())) {
             int previous_state = comboBox->property("previous").toInt();
 
-            int prev = comboBox->currentIndex()-2;
-            int next = comboBox->currentIndex()+2;
+            int prev = comboBox->currentIndex() - 2;
+            int next = comboBox->currentIndex() + 2;
 
-            if(previous_state<comboBox->currentIndex() && next < comboBox->count())
+            if (previous_state < comboBox->currentIndex() && next < comboBox->count())
                 comboBox->setCurrentIndex(next);
-            else if(previous_state>comboBox->currentIndex() && prev >= 0)
+            else if (previous_state > comboBox->currentIndex() && prev >= 0)
                 comboBox->setCurrentIndex(prev);
             else
                 comboBox->setCurrentIndex(previous_state);