diff --git a/Fit/Minimizer/MinimizerInfo.cpp b/Fit/Minimizer/MinimizerInfo.cpp index 7b081a05a569cca12f51c3ad8c562520552872e0..466214ab75cb075a52b18cc555b12ff5f79e4b21 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 9026f9f42d1c56d0978f0aa6c99fa7101305f882..49315b019d19445fdcecb051024e8d4d95478056 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 faeb0646f0ad7a6f64a86bc8365028491169770b..06730aa2a0506a9c7493f7ba7237d802bb9c241c 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);