From d6ad5671243f2bbb0314354c514b604c522a3838 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (l)" <j.wuttke@fz-juelich.de>
Date: Sun, 27 Sep 2020 08:32:24 +0200
Subject: [PATCH] Tests/../Fitting/Plan: comment and minor simplifications
---
Tests/Functional/Core/Fitting/Plan.cpp | 15 +++++----------
Tests/Functional/Core/Fitting/Plan.h | 1 +
2 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/Tests/Functional/Core/Fitting/Plan.cpp b/Tests/Functional/Core/Fitting/Plan.cpp
index 0da93909c3a..32082e08db9 100644
--- a/Tests/Functional/Core/Fitting/Plan.cpp
+++ b/Tests/Functional/Core/Fitting/Plan.cpp
@@ -30,7 +30,7 @@ Plan::~Plan() = default;
bool Plan::checkMinimizer(Fit::Minimizer& minimizer)
{
- auto fit_objective = createFitObjective();
+ std::unique_ptr<FitObjective> fit_objective = createFitObjective();
fcn_scalar_t scalar_func = [&](const Fit::Parameters& params) {
return fit_objective->evaluate(params);
@@ -40,7 +40,6 @@ bool Plan::checkMinimizer(Fit::Minimizer& minimizer)
return fit_objective->evaluate_residuals(params);
};
- bool success(true);
Fit::MinimizerResult result;
if (m_residual_based)
@@ -51,7 +50,7 @@ bool Plan::checkMinimizer(Fit::Minimizer& minimizer)
fit_objective->finalize(result);
std::cout << "Plan::checkResult() -> " << name() << std::endl;
- success &= valuesAsExpected(result.parameters().values());
+ bool success = valuesAsExpected(result.parameters().values());
std::cout << std::endl;
return success;
@@ -93,20 +92,16 @@ std::unique_ptr<Simulation> Plan::buildSimulation(const Fit::Parameters& params)
//! Creates simulation for given set of fit parameters. No sample yets.
-std::unique_ptr<Simulation> Plan::createSimulation(const Fit::Parameters& params) const
+std::unique_ptr<Simulation> Plan::createSimulation(const Fit::Parameters&) const
{
- (void)params;
- SimulationFactory factory;
- auto simulation = factory.createItemPtr(m_simulation_name);
- return simulation;
+ return SimulationFactory().createItemPtr(m_simulation_name);
}
//! Creates sample for given set of fit parameters.
std::unique_ptr<MultiLayer> Plan::createMultiLayer(const Fit::Parameters& params) const
{
- SampleBuilderFactory factory;
- auto sample_builder = factory.createItemPtr(m_sample_builder_name);
+ auto sample_builder = SampleBuilderFactory().createItemPtr(m_sample_builder_name);
// propagating current values of fit parameters to sample builder before building the sample
for (const auto& par : params)
diff --git a/Tests/Functional/Core/Fitting/Plan.h b/Tests/Functional/Core/Fitting/Plan.h
index b2d957a871b..bd36ce084cb 100644
--- a/Tests/Functional/Core/Fitting/Plan.h
+++ b/Tests/Functional/Core/Fitting/Plan.h
@@ -28,6 +28,7 @@ template <class T> class OutputData;
class FitObjective;
//! Contains all logic to construct FitObjective, setup Minimizer and check minimization results.
+//! Parent of various *Plan classes in source file PlanCases.
class Plan : public MinimizerTestPlan
{
--
GitLab