From 534a1fe67903ff9c63921b5f7ed0c762b8ca498b Mon Sep 17 00:00:00 2001
From: Dmitri Naumov <dmitri.naumov@ufz.de>
Date: Mon, 2 Mar 2020 16:29:58 +0100
Subject: [PATCH] [NL/TS] Move EvolutionaryPIDC. ctor impl to cpp.
---
.../Algorithms/EvolutionaryPIDcontroller.cpp | 20 +++++++++++++++++++
.../Algorithms/EvolutionaryPIDcontroller.h | 18 +----------------
2 files changed, 21 insertions(+), 17 deletions(-)
diff --git a/NumLib/TimeStepping/Algorithms/EvolutionaryPIDcontroller.cpp b/NumLib/TimeStepping/Algorithms/EvolutionaryPIDcontroller.cpp
index b356039b420..b9ec34a2b66 100644
--- a/NumLib/TimeStepping/Algorithms/EvolutionaryPIDcontroller.cpp
+++ b/NumLib/TimeStepping/Algorithms/EvolutionaryPIDcontroller.cpp
@@ -20,6 +20,26 @@
namespace NumLib
{
+EvolutionaryPIDcontroller::EvolutionaryPIDcontroller(
+ const double t0, const double t_end, const double h0, const double h_min,
+ const double h_max, const double rel_h_min, const double rel_h_max,
+ std::vector<double>&& fixed_output_times, const double tol)
+ : TimeStepAlgorithm(t0, t_end),
+ _h0(h0),
+ _h_min(h_min),
+ _h_max(h_max),
+ _rel_h_min(rel_h_min),
+ _rel_h_max(rel_h_max),
+ _fixed_output_times(std::move(fixed_output_times)),
+ _tol(tol),
+ _e_n_minus1(0.),
+ _e_n_minus2(0.),
+ _is_accepted(true)
+{
+ // Remove possible duplicated elements. Result will be sorted.
+ BaseLib::makeVectorUnique(_fixed_output_times);
+}
+
bool EvolutionaryPIDcontroller::next(double const solution_error,
int const /*number_iterations*/)
{
diff --git a/NumLib/TimeStepping/Algorithms/EvolutionaryPIDcontroller.h b/NumLib/TimeStepping/Algorithms/EvolutionaryPIDcontroller.h
index ad2d397e91f..069daca9aab 100644
--- a/NumLib/TimeStepping/Algorithms/EvolutionaryPIDcontroller.h
+++ b/NumLib/TimeStepping/Algorithms/EvolutionaryPIDcontroller.h
@@ -15,7 +15,6 @@
#include <vector>
#include "TimeStepAlgorithm.h"
-#include "BaseLib/Algorithm.h"
namespace BaseLib
{
@@ -57,22 +56,7 @@ public:
const double h_max, const double rel_h_min,
const double rel_h_max,
std::vector<double>&& fixed_output_times,
- const double tol)
- : TimeStepAlgorithm(t0, t_end),
- _h0(h0),
- _h_min(h_min),
- _h_max(h_max),
- _rel_h_min(rel_h_min),
- _rel_h_max(rel_h_max),
- _fixed_output_times(std::move(fixed_output_times)),
- _tol(tol),
- _e_n_minus1(0.),
- _e_n_minus2(0.),
- _is_accepted(true)
- {
- // Remove possible duplicated elements. Result will be sorted.
- BaseLib::makeVectorUnique(_fixed_output_times);
- }
+ const double tol);
bool next(double solution_error, int number_iterations) override;
--
GitLab