From 0b7468edda2e6c9cf55a7c3dd8c5b18c046bf870 Mon Sep 17 00:00:00 2001
From: Mikhail Svechnikov <m.svechnikov@fz-juelich.de>
Date: Fri, 26 Aug 2022 14:13:02 +0200
Subject: [PATCH] Minimizers and algorithms names are changed
---
Fit/Minimizer/MinimizerInfo.cpp | 6 +++---
Fit/Test/Functional/MinimizerTests.cpp | 10 +++++-----
GUI/Model/Job/MinimizerItem.cpp | 13 ++++++++++---
3 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/Fit/Minimizer/MinimizerInfo.cpp b/Fit/Minimizer/MinimizerInfo.cpp
index 7b081a05a56..466214ab75c 100644
--- a/Fit/Minimizer/MinimizerInfo.cpp
+++ b/Fit/Minimizer/MinimizerInfo.cpp
@@ -108,7 +108,7 @@ MinimizerInfo MinimizerInfo::buildGSLMultiMinInfo(const std::string& defaultAlgo
MinimizerInfo MinimizerInfo::buildGSLLMAInfo()
{
MinimizerInfo result("GSLLMA", "Levenberg-Marquardt from GSL library");
- result.addAlgorithm("Default", "Default algorithm");
+ result.addAlgorithm("Levenberg-Marquardt", "Levenberg-Marquardt");
return result;
}
@@ -117,7 +117,7 @@ MinimizerInfo MinimizerInfo::buildGSLLMAInfo()
MinimizerInfo MinimizerInfo::buildGSLSimAnInfo()
{
MinimizerInfo result("GSLSimAn", "Simulated annealing minimizer from GSL library");
- result.addAlgorithm("Default", "Default algorithm");
+ result.addAlgorithm("Simulated annealing", "Simulated annealing algorithm from GSL library");
return result;
}
@@ -126,7 +126,7 @@ MinimizerInfo MinimizerInfo::buildGSLSimAnInfo()
MinimizerInfo MinimizerInfo::buildGeneticInfo()
{
MinimizerInfo result("Genetic", "Genetic minimizer from TMVA library");
- result.addAlgorithm("Default", "Default algorithm");
+ result.addAlgorithm("Genetic", "Genetic algorithm from TMVA library");
return result;
}
diff --git a/Fit/Test/Functional/MinimizerTests.cpp b/Fit/Test/Functional/MinimizerTests.cpp
index 9026f9f42d1..49315b019d1 100644
--- a/Fit/Test/Functional/MinimizerTests.cpp
+++ b/Fit/Test/Functional/MinimizerTests.cpp
@@ -111,25 +111,25 @@ TEST_F(Minimize, Bfgs2_WoodFour)
TEST_F(Minimize, GSLSimAn_EasyRosenbrock)
{
EasyRosenbrockPlan plan;
- EXPECT_TRUE(runMinimizerTest("GSLSimAn", "Default", plan));
+ EXPECT_TRUE(runMinimizerTest("GSLSimAn", "Simulated annealing", plan));
}
TEST_F(Minimize, GSLSimAn_EasyWoodFour)
{
EasyWoodFourPlan plan;
- EXPECT_TRUE(runMinimizerTest("GSLSimAn", "Default", plan));
+ EXPECT_TRUE(runMinimizerTest("GSLSimAn", "Simulated annealing", plan));
}
TEST_F(Minimize, Genetic_EasyRosenbrock)
{
EasyRosenbrockPlan plan;
- EXPECT_TRUE(runMinimizerTest("Genetic", "Default", plan, "RandomSeed=1"));
+ EXPECT_TRUE(runMinimizerTest("Genetic", "Genetic", plan, "RandomSeed=1"));
}
TEST_F(Minimize, Genetic_EasyWoodFour)
{
EasyWoodFourPlan plan;
- EXPECT_TRUE(runMinimizerTest("Genetic", "Default", plan, "RandomSeed=1"));
+ EXPECT_TRUE(runMinimizerTest("Genetic", "Genetic", plan, "RandomSeed=1"));
}
TEST_F(Minimize, Fumili_DecayingSin)
@@ -141,5 +141,5 @@ TEST_F(Minimize, Fumili_DecayingSin)
TEST_F(Minimize, LevenbergMarquardtV3)
{
DecayingSinPlanV2 plan;
- EXPECT_TRUE(runMinimizerTest("GSLLMA", "Default", plan));
+ EXPECT_TRUE(runMinimizerTest("GSLLMA", "Levenberg-Marquardt", plan));
}
diff --git a/GUI/Model/Job/MinimizerItem.cpp b/GUI/Model/Job/MinimizerItem.cpp
index faeb0646f0a..06730aa2a05 100644
--- a/GUI/Model/Job/MinimizerItem.cpp
+++ b/GUI/Model/Job/MinimizerItem.cpp
@@ -82,9 +82,16 @@ QStringList create_algorithm_list_and_map(QString& default_common_algorithm)
// group 4
common_algorithms_list.append("GSL");
- name = shift + "Simulated Annealing";
- common_algorithms_list.append(name);
- algorithm_minimizer_map.insert(name, minimizer_names_map.key(SimAnMinimizerItem::M_TYPE));
+ QStringList annealingAlgorithms =
+ MinimizerItemCatalog::algorithmNames(SimAnMinimizerItem::M_TYPE);
+ for (QString algorithm : annealingAlgorithms) {
+ name = shift + algorithm;
+ common_algorithms_list.append(name);
+ algorithm_minimizer_map.insert(name, minimizer_names_map.key(SimAnMinimizerItem::M_TYPE));
+ }
+// name = shift + "Simulated Annealing";
+// common_algorithms_list.append(name);
+// algorithm_minimizer_map.insert(name, minimizer_names_map.key(SimAnMinimizerItem::M_TYPE));
name = shift + "Levenberg-Marquardt";
common_algorithms_list.append(name);
--
GitLab