From 8a1498cd982378731baaf740367aeb93cd4a6867 Mon Sep 17 00:00:00 2001 From: Niels Dekker Date: Tue, 8 Oct 2024 15:30:27 +0200 Subject: [PATCH] STYLE: Remove `const` from `const std::string` return types MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Removing this `const` enables move semantics, which may improve the performance. Following C++ Core Guidelines, Oct 3, 2024, Don’t return `const T`: https://isocpp.github.io/CppCoreGuidelines/CppCoreGuidelines#Rf-return-const See also: https://clang.llvm.org/extra/clang-tidy/checks/readability/const-return-type.html --- Modules/Core/SpatialObjects/include/itkSpatialObject.h | 2 +- .../src/itkPolygonGroupSpatialObjectXMLFile.cxx | 2 +- Modules/IO/TransformBase/include/itkTransformIOBase.h | 6 +++--- Modules/IO/TransformHDF5/include/itkHDF5TransformIO.h | 4 ++-- Modules/IO/TransformHDF5/src/itkHDF5TransformIO.cxx | 2 +- Modules/Numerics/Optimizers/include/itkAmoebaOptimizer.h | 2 +- .../Optimizers/include/itkCumulativeGaussianOptimizer.h | 2 +- .../Numerics/Optimizers/include/itkExhaustiveOptimizer.h | 2 +- .../Optimizers/include/itkGradientDescentOptimizer.h | 2 +- Modules/Numerics/Optimizers/include/itkLBFGSBOptimizer.h | 2 +- Modules/Numerics/Optimizers/include/itkLBFGSOptimizer.h | 2 +- .../Optimizers/include/itkLevenbergMarquardtOptimizer.h | 2 +- .../Optimizers/include/itkOnePlusOneEvolutionaryOptimizer.h | 2 +- Modules/Numerics/Optimizers/include/itkOptimizer.h | 2 +- .../Optimizers/include/itkParticleSwarmOptimizerBase.h | 2 +- Modules/Numerics/Optimizers/include/itkPowellOptimizer.h | 2 +- .../include/itkRegularStepGradientDescentBaseOptimizer.h | 2 +- Modules/Numerics/Optimizers/include/itkSPSAOptimizer.h | 2 +- Modules/Numerics/Optimizers/src/itkAmoebaOptimizer.cxx | 2 +- .../Optimizers/src/itkCumulativeGaussianOptimizer.cxx | 2 +- Modules/Numerics/Optimizers/src/itkExhaustiveOptimizer.cxx | 2 +- .../Numerics/Optimizers/src/itkGradientDescentOptimizer.cxx | 2 +- Modules/Numerics/Optimizers/src/itkLBFGSBOptimizer.cxx | 2 +- Modules/Numerics/Optimizers/src/itkLBFGSOptimizer.cxx | 2 +- .../Optimizers/src/itkLevenbergMarquardtOptimizer.cxx | 2 +- .../Optimizers/src/itkOnePlusOneEvolutionaryOptimizer.cxx | 2 +- Modules/Numerics/Optimizers/src/itkOptimizer.cxx | 2 +- .../Optimizers/src/itkParticleSwarmOptimizerBase.cxx | 2 +- Modules/Numerics/Optimizers/src/itkPowellOptimizer.cxx | 2 +- .../src/itkRegularStepGradientDescentBaseOptimizer.cxx | 2 +- Modules/Numerics/Optimizers/src/itkSPSAOptimizer.cxx | 2 +- .../Numerics/Optimizersv4/include/itkAmoebaOptimizerv4.h | 2 +- .../Optimizersv4/include/itkExhaustiveOptimizerv4.h | 2 +- .../Optimizersv4/include/itkExhaustiveOptimizerv4.hxx | 2 +- .../include/itkGradientDescentOptimizerBasev4.h | 2 +- .../include/itkGradientDescentOptimizerBasev4.hxx | 2 +- .../Numerics/Optimizersv4/include/itkLBFGS2Optimizerv4.h | 2 +- .../Numerics/Optimizersv4/include/itkLBFGS2Optimizerv4.hxx | 2 +- .../Numerics/Optimizersv4/include/itkLBFGSOptimizerBasev4.h | 2 +- .../Optimizersv4/include/itkMultiGradientOptimizerv4.h | 2 +- .../Optimizersv4/include/itkMultiGradientOptimizerv4.hxx | 2 +- .../Optimizersv4/include/itkMultiStartOptimizerv4.h | 2 +- .../Optimizersv4/include/itkMultiStartOptimizerv4.hxx | 2 +- .../Optimizersv4/include/itkObjectToObjectOptimizerBase.h | 2 +- .../include/itkOnePlusOneEvolutionaryOptimizerv4.h | 2 +- .../include/itkOnePlusOneEvolutionaryOptimizerv4.hxx | 2 +- .../Numerics/Optimizersv4/include/itkPowellOptimizerv4.h | 2 +- .../Numerics/Optimizersv4/include/itkPowellOptimizerv4.hxx | 2 +- .../include/itkSingleValuedNonLinearVnlOptimizerv4.h | 2 +- Modules/Numerics/Optimizersv4/src/itkAmoebaOptimizerv4.cxx | 2 +- .../Numerics/Optimizersv4/src/itkLBFGSOptimizerv4Base.cxx | 2 +- .../test/itkObjectToObjectOptimizerBaseTest.cxx | 2 +- 52 files changed, 55 insertions(+), 55 deletions(-) diff --git a/Modules/Core/SpatialObjects/include/itkSpatialObject.h b/Modules/Core/SpatialObjects/include/itkSpatialObject.h index 050bfaf498b..768ab41b9c6 100644 --- a/Modules/Core/SpatialObjects/include/itkSpatialObject.h +++ b/Modules/Core/SpatialObjects/include/itkSpatialObject.h @@ -147,7 +147,7 @@ class ITK_TEMPLATE_EXPORT SpatialObject : public DataObject itkSetMacro(TypeName, std::string); /** Get the typename of the SpatialObject */ - virtual const std::string + virtual std::string GetTypeName() const { return m_TypeName; diff --git a/Modules/IO/SpatialObjects/src/itkPolygonGroupSpatialObjectXMLFile.cxx b/Modules/IO/SpatialObjects/src/itkPolygonGroupSpatialObjectXMLFile.cxx index 72504af1b86..d882fc031e4 100644 --- a/Modules/IO/SpatialObjects/src/itkPolygonGroupSpatialObjectXMLFile.cxx +++ b/Modules/IO/SpatialObjects/src/itkPolygonGroupSpatialObjectXMLFile.cxx @@ -162,7 +162,7 @@ template <> class NumericTraits { public: - static const std::string + static std::string ZeroValue() { return std::string(""); diff --git a/Modules/IO/TransformBase/include/itkTransformIOBase.h b/Modules/IO/TransformBase/include/itkTransformIOBase.h index 584c3dc70f4..9203f4dc316 100644 --- a/Modules/IO/TransformBase/include/itkTransformIOBase.h +++ b/Modules/IO/TransformBase/include/itkTransformIOBase.h @@ -162,7 +162,7 @@ class ITKIOTransformBase_TEMPLATE_EXPORT TransformIOBaseTemplate : public LightP /* The following struct returns the string name of computation type */ /* default implementation */ - static inline const std::string + static inline std::string GetTypeNameString() { itkGenericExceptionMacro("Unknown ScalarType" << typeid(ScalarType).name()); @@ -203,14 +203,14 @@ TransformIOBaseTemplate::CorrectTransformPrecisionType(std::string & inp } template <> -inline const std::string +inline std::string TransformIOBaseTemplate::GetTypeNameString() { return std::string("float"); } template <> -inline const std::string +inline std::string TransformIOBaseTemplate::GetTypeNameString() { return std::string("double"); diff --git a/Modules/IO/TransformHDF5/include/itkHDF5TransformIO.h b/Modules/IO/TransformHDF5/include/itkHDF5TransformIO.h index 0e32cc8b8f5..0eed59c7f39 100644 --- a/Modules/IO/TransformHDF5/include/itkHDF5TransformIO.h +++ b/Modules/IO/TransformHDF5/include/itkHDF5TransformIO.h @@ -160,8 +160,8 @@ class ITK_TEMPLATE_EXPORT HDF5TransformIOTemplate GetH5TypeFromString() const; }; -const std::string ITKIOTransformHDF5_EXPORT - GetTransformName(int); +std::string ITKIOTransformHDF5_EXPORT + GetTransformName(int); /** This helps to meet backward compatibility */ using HDF5TransformIO = HDF5TransformIOTemplate; diff --git a/Modules/IO/TransformHDF5/src/itkHDF5TransformIO.cxx b/Modules/IO/TransformHDF5/src/itkHDF5TransformIO.cxx index 92fd1cfb945..9e50f8e96cd 100644 --- a/Modules/IO/TransformHDF5/src/itkHDF5TransformIO.cxx +++ b/Modules/IO/TransformHDF5/src/itkHDF5TransformIO.cxx @@ -495,7 +495,7 @@ const std::string HDF5CommonPathNames::OSVersion("/OSVersion"); // Since (for now) transforms are ordered in a file, but // not named, I name them by their order in the file, // beginning with zero. -const std::string +std::string GetTransformName(int i) { std::stringstream s; diff --git a/Modules/Numerics/Optimizers/include/itkAmoebaOptimizer.h b/Modules/Numerics/Optimizers/include/itkAmoebaOptimizer.h index aae6ce036cb..7cb6a4c8720 100644 --- a/Modules/Numerics/Optimizers/include/itkAmoebaOptimizer.h +++ b/Modules/Numerics/Optimizers/include/itkAmoebaOptimizer.h @@ -146,7 +146,7 @@ class ITKOptimizers_EXPORT AmoebaOptimizer : public SingleValuedNonLinearVnlOpti itkGetConstMacro(FunctionConvergenceTolerance, double); /** Report the reason for stopping. */ - const std::string + std::string GetStopConditionDescription() const override; /** Return Current Value */ diff --git a/Modules/Numerics/Optimizers/include/itkCumulativeGaussianOptimizer.h b/Modules/Numerics/Optimizers/include/itkCumulativeGaussianOptimizer.h index fe4e8a2a1ae..62dcfb42e3f 100644 --- a/Modules/Numerics/Optimizers/include/itkCumulativeGaussianOptimizer.h +++ b/Modules/Numerics/Optimizers/include/itkCumulativeGaussianOptimizer.h @@ -92,7 +92,7 @@ class ITKOptimizers_EXPORT CumulativeGaussianOptimizer : public MultipleValuedNo PrintArray(MeasureType * array); /** Report the reason for stopping. */ - const std::string + std::string GetStopConditionDescription() const override; protected: diff --git a/Modules/Numerics/Optimizers/include/itkExhaustiveOptimizer.h b/Modules/Numerics/Optimizers/include/itkExhaustiveOptimizer.h index ad3c60a4f80..f65d873c116 100644 --- a/Modules/Numerics/Optimizers/include/itkExhaustiveOptimizer.h +++ b/Modules/Numerics/Optimizers/include/itkExhaustiveOptimizer.h @@ -131,7 +131,7 @@ class ITKOptimizers_EXPORT ExhaustiveOptimizer : public SingleValuedNonLinearOpt itkGetConstReferenceMacro(MaximumNumberOfIterations, SizeValueType); /** Get the reason for termination */ - const std::string + std::string GetStopConditionDescription() const override; protected: diff --git a/Modules/Numerics/Optimizers/include/itkGradientDescentOptimizer.h b/Modules/Numerics/Optimizers/include/itkGradientDescentOptimizer.h index e970db8f179..0685a027cc5 100644 --- a/Modules/Numerics/Optimizers/include/itkGradientDescentOptimizer.h +++ b/Modules/Numerics/Optimizers/include/itkGradientDescentOptimizer.h @@ -160,7 +160,7 @@ class ITKOptimizers_EXPORT GradientDescentOptimizer : public SingleValuedNonLine /** Get Stop condition. */ itkGetConstReferenceMacro(StopCondition, StopConditionGradientDescentOptimizerEnum); - const std::string + std::string GetStopConditionDescription() const override; /** Get Gradient condition. */ diff --git a/Modules/Numerics/Optimizers/include/itkLBFGSBOptimizer.h b/Modules/Numerics/Optimizers/include/itkLBFGSBOptimizer.h index 2d8c9e716e3..2cf832613a8 100644 --- a/Modules/Numerics/Optimizers/include/itkLBFGSBOptimizer.h +++ b/Modules/Numerics/Optimizers/include/itkLBFGSBOptimizer.h @@ -191,7 +191,7 @@ class ITKOptimizers_EXPORT LBFGSBOptimizer : public SingleValuedNonLinearVnlOpti itkGetConstReferenceMacro(InfinityNormOfProjectedGradient, double); /** Get the reason for termination */ - const std::string + std::string GetStopConditionDescription() const override; /** Returns false unconditionally because LBFGSBOptimizer does not support using scales. */ diff --git a/Modules/Numerics/Optimizers/include/itkLBFGSOptimizer.h b/Modules/Numerics/Optimizers/include/itkLBFGSOptimizer.h index 9d7621cea9a..1adf94b085b 100644 --- a/Modules/Numerics/Optimizers/include/itkLBFGSOptimizer.h +++ b/Modules/Numerics/Optimizers/include/itkLBFGSOptimizer.h @@ -168,7 +168,7 @@ class ITKOptimizers_EXPORT LBFGSOptimizer : public SingleValuedNonLinearVnlOptim GetValue() const; /** Get the reason for termination */ - const std::string + std::string GetStopConditionDescription() const override; protected: diff --git a/Modules/Numerics/Optimizers/include/itkLevenbergMarquardtOptimizer.h b/Modules/Numerics/Optimizers/include/itkLevenbergMarquardtOptimizer.h index 7428ae2a0e4..c1cb85636b1 100644 --- a/Modules/Numerics/Optimizers/include/itkLevenbergMarquardtOptimizer.h +++ b/Modules/Numerics/Optimizers/include/itkLevenbergMarquardtOptimizer.h @@ -86,7 +86,7 @@ class ITKOptimizers_EXPORT LevenbergMarquardtOptimizer : public MultipleValuedNo MeasureType GetValue() const; - const std::string + std::string GetStopConditionDescription() const override; protected: diff --git a/Modules/Numerics/Optimizers/include/itkOnePlusOneEvolutionaryOptimizer.h b/Modules/Numerics/Optimizers/include/itkOnePlusOneEvolutionaryOptimizer.h index d19935fdb3a..851ffe22376 100644 --- a/Modules/Numerics/Optimizers/include/itkOnePlusOneEvolutionaryOptimizer.h +++ b/Modules/Numerics/Optimizers/include/itkOnePlusOneEvolutionaryOptimizer.h @@ -187,7 +187,7 @@ class ITKOptimizers_EXPORT OnePlusOneEvolutionaryOptimizer : public SingleValued itkGetConstReferenceMacro(MetricWorstPossibleValue, double); itkSetMacro(MetricWorstPossibleValue, double); - const std::string + std::string GetStopConditionDescription() const override; protected: diff --git a/Modules/Numerics/Optimizers/include/itkOptimizer.h b/Modules/Numerics/Optimizers/include/itkOptimizer.h index a2f6eab90f7..0ac2d7fb8a0 100644 --- a/Modules/Numerics/Optimizers/include/itkOptimizer.h +++ b/Modules/Numerics/Optimizers/include/itkOptimizer.h @@ -88,7 +88,7 @@ class ITKOptimizers_EXPORT Optimizer : public Object {} /** Get the reason for termination */ - virtual const std::string + virtual std::string GetStopConditionDescription() const; protected: diff --git a/Modules/Numerics/Optimizers/include/itkParticleSwarmOptimizerBase.h b/Modules/Numerics/Optimizers/include/itkParticleSwarmOptimizerBase.h index 258ba9e4007..166813901f8 100644 --- a/Modules/Numerics/Optimizers/include/itkParticleSwarmOptimizerBase.h +++ b/Modules/Numerics/Optimizers/include/itkParticleSwarmOptimizerBase.h @@ -193,7 +193,7 @@ class ITKOptimizers_EXPORT ParticleSwarmOptimizerBase : public SingleValuedNonLi GetValue() const; /** Get the reason for termination */ - const std::string + std::string GetStopConditionDescription() const override; /** Print the swarm information to the given output stream. Each line diff --git a/Modules/Numerics/Optimizers/include/itkPowellOptimizer.h b/Modules/Numerics/Optimizers/include/itkPowellOptimizer.h index 9779c9c1663..1b09fda5f38 100644 --- a/Modules/Numerics/Optimizers/include/itkPowellOptimizer.h +++ b/Modules/Numerics/Optimizers/include/itkPowellOptimizer.h @@ -142,7 +142,7 @@ class ITKOptimizers_EXPORT PowellOptimizer : public SingleValuedNonLinearOptimiz itkGetConstReferenceMacro(MetricWorstPossibleValue, double); itkSetMacro(MetricWorstPossibleValue, double); - const std::string + std::string GetStopConditionDescription() const override; protected: diff --git a/Modules/Numerics/Optimizers/include/itkRegularStepGradientDescentBaseOptimizer.h b/Modules/Numerics/Optimizers/include/itkRegularStepGradientDescentBaseOptimizer.h index c74bff690c1..d013314f2c7 100644 --- a/Modules/Numerics/Optimizers/include/itkRegularStepGradientDescentBaseOptimizer.h +++ b/Modules/Numerics/Optimizers/include/itkRegularStepGradientDescentBaseOptimizer.h @@ -140,7 +140,7 @@ class ITKOptimizers_EXPORT RegularStepGradientDescentBaseOptimizer : public Sing itkGetConstReferenceMacro(Gradient, DerivativeType); /** Get the reason for termination */ - const std::string + std::string GetStopConditionDescription() const override; protected: diff --git a/Modules/Numerics/Optimizers/include/itkSPSAOptimizer.h b/Modules/Numerics/Optimizers/include/itkSPSAOptimizer.h index 40a3782edb4..630e134bc71 100644 --- a/Modules/Numerics/Optimizers/include/itkSPSAOptimizer.h +++ b/Modules/Numerics/Optimizers/include/itkSPSAOptimizer.h @@ -251,7 +251,7 @@ class ITKOptimizers_EXPORT SPSAOptimizer : public SingleValuedNonLinearOptimizer itkGetConstMacro(Tolerance, double); /** Get the reason for termination */ - const std::string + std::string GetStopConditionDescription() const override; protected: diff --git a/Modules/Numerics/Optimizers/src/itkAmoebaOptimizer.cxx b/Modules/Numerics/Optimizers/src/itkAmoebaOptimizer.cxx index 685b386811f..abd094c8843 100644 --- a/Modules/Numerics/Optimizers/src/itkAmoebaOptimizer.cxx +++ b/Modules/Numerics/Optimizers/src/itkAmoebaOptimizer.cxx @@ -39,7 +39,7 @@ AmoebaOptimizer::AmoebaOptimizer() AmoebaOptimizer::~AmoebaOptimizer() = default; -const std::string +std::string AmoebaOptimizer::GetStopConditionDescription() const { return this->m_StopConditionDescription.str(); diff --git a/Modules/Numerics/Optimizers/src/itkCumulativeGaussianOptimizer.cxx b/Modules/Numerics/Optimizers/src/itkCumulativeGaussianOptimizer.cxx index 977c8a57fe6..a28af7df230 100644 --- a/Modules/Numerics/Optimizers/src/itkCumulativeGaussianOptimizer.cxx +++ b/Modules/Numerics/Optimizers/src/itkCumulativeGaussianOptimizer.cxx @@ -374,7 +374,7 @@ CumulativeGaussianOptimizer::VerticalBestShift(MeasureType * originalArray, Meas return (c / size); } -const std::string +std::string CumulativeGaussianOptimizer::GetStopConditionDescription() const { return m_StopConditionDescription.str(); diff --git a/Modules/Numerics/Optimizers/src/itkExhaustiveOptimizer.cxx b/Modules/Numerics/Optimizers/src/itkExhaustiveOptimizer.cxx index 8d08312833c..af00200de77 100644 --- a/Modules/Numerics/Optimizers/src/itkExhaustiveOptimizer.cxx +++ b/Modules/Numerics/Optimizers/src/itkExhaustiveOptimizer.cxx @@ -184,7 +184,7 @@ ExhaustiveOptimizer::IncrementIndex(ParametersType & newPosition) } } -const std::string +std::string ExhaustiveOptimizer::GetStopConditionDescription() const { return m_StopConditionDescription.str(); diff --git a/Modules/Numerics/Optimizers/src/itkGradientDescentOptimizer.cxx b/Modules/Numerics/Optimizers/src/itkGradientDescentOptimizer.cxx index 280cafe9077..8bd4e635f17 100644 --- a/Modules/Numerics/Optimizers/src/itkGradientDescentOptimizer.cxx +++ b/Modules/Numerics/Optimizers/src/itkGradientDescentOptimizer.cxx @@ -29,7 +29,7 @@ GradientDescentOptimizer::GradientDescentOptimizer() m_StopConditionDescription << this->GetNameOfClass() << ": "; } -const std::string +std::string GradientDescentOptimizer::GetStopConditionDescription() const { return m_StopConditionDescription.str(); diff --git a/Modules/Numerics/Optimizers/src/itkLBFGSBOptimizer.cxx b/Modules/Numerics/Optimizers/src/itkLBFGSBOptimizer.cxx index f4661a96639..ecca60cf81f 100644 --- a/Modules/Numerics/Optimizers/src/itkLBFGSBOptimizer.cxx +++ b/Modules/Numerics/Optimizers/src/itkLBFGSBOptimizer.cxx @@ -374,7 +374,7 @@ LBFGSBOptimizerHelper::report_iter() } } -const std::string +std::string LBFGSBOptimizer::GetStopConditionDescription() const { std::ostringstream stopConditionDescription; diff --git a/Modules/Numerics/Optimizers/src/itkLBFGSOptimizer.cxx b/Modules/Numerics/Optimizers/src/itkLBFGSOptimizer.cxx index 83ec3fa5199..cf6e6be7475 100644 --- a/Modules/Numerics/Optimizers/src/itkLBFGSOptimizer.cxx +++ b/Modules/Numerics/Optimizers/src/itkLBFGSOptimizer.cxx @@ -260,7 +260,7 @@ LBFGSOptimizer::GetOptimizer() return m_VnlOptimizer.get(); } -const std::string +std::string LBFGSOptimizer::GetStopConditionDescription() const { m_StopConditionDescription.str(""); diff --git a/Modules/Numerics/Optimizers/src/itkLevenbergMarquardtOptimizer.cxx b/Modules/Numerics/Optimizers/src/itkLevenbergMarquardtOptimizer.cxx index 40541d676bb..6629c4b81b6 100644 --- a/Modules/Numerics/Optimizers/src/itkLevenbergMarquardtOptimizer.cxx +++ b/Modules/Numerics/Optimizers/src/itkLevenbergMarquardtOptimizer.cxx @@ -198,7 +198,7 @@ LevenbergMarquardtOptimizer::GetOptimizer() const return m_VnlOptimizer.get(); } -const std::string +std::string LevenbergMarquardtOptimizer::GetStopConditionDescription() const { std::ostringstream reason, outcome; diff --git a/Modules/Numerics/Optimizers/src/itkOnePlusOneEvolutionaryOptimizer.cxx b/Modules/Numerics/Optimizers/src/itkOnePlusOneEvolutionaryOptimizer.cxx index ad9e0acd7f7..f34f07bbd14 100644 --- a/Modules/Numerics/Optimizers/src/itkOnePlusOneEvolutionaryOptimizer.cxx +++ b/Modules/Numerics/Optimizers/src/itkOnePlusOneEvolutionaryOptimizer.cxx @@ -287,7 +287,7 @@ OnePlusOneEvolutionaryOptimizer::StartOptimization() * */ -const std::string +std::string OnePlusOneEvolutionaryOptimizer::GetStopConditionDescription() const { return m_StopConditionDescription.str(); diff --git a/Modules/Numerics/Optimizers/src/itkOptimizer.cxx b/Modules/Numerics/Optimizers/src/itkOptimizer.cxx index 9ee10a601d2..a8288041345 100644 --- a/Modules/Numerics/Optimizers/src/itkOptimizer.cxx +++ b/Modules/Numerics/Optimizers/src/itkOptimizer.cxx @@ -72,7 +72,7 @@ Optimizer::SetCurrentPosition(const ParametersType & param) this->Modified(); } -const std::string +std::string Optimizer::GetStopConditionDescription() const { std::ostringstream description; diff --git a/Modules/Numerics/Optimizers/src/itkParticleSwarmOptimizerBase.cxx b/Modules/Numerics/Optimizers/src/itkParticleSwarmOptimizerBase.cxx index 555295a1c38..7ab87520c67 100644 --- a/Modules/Numerics/Optimizers/src/itkParticleSwarmOptimizerBase.cxx +++ b/Modules/Numerics/Optimizers/src/itkParticleSwarmOptimizerBase.cxx @@ -133,7 +133,7 @@ ParticleSwarmOptimizerBase::GetValue() const } -const std::string +std::string ParticleSwarmOptimizerBase::GetStopConditionDescription() const { return this->m_StopConditionDescription.str(); diff --git a/Modules/Numerics/Optimizers/src/itkPowellOptimizer.cxx b/Modules/Numerics/Optimizers/src/itkPowellOptimizer.cxx index 705a8f8b5ea..4cd7f735368 100644 --- a/Modules/Numerics/Optimizers/src/itkPowellOptimizer.cxx +++ b/Modules/Numerics/Optimizers/src/itkPowellOptimizer.cxx @@ -527,7 +527,7 @@ PowellOptimizer::StartOptimization() /** * */ -const std::string +std::string PowellOptimizer::GetStopConditionDescription() const { return m_StopConditionDescription.str(); diff --git a/Modules/Numerics/Optimizers/src/itkRegularStepGradientDescentBaseOptimizer.cxx b/Modules/Numerics/Optimizers/src/itkRegularStepGradientDescentBaseOptimizer.cxx index 3961281cb19..27203497fd3 100644 --- a/Modules/Numerics/Optimizers/src/itkRegularStepGradientDescentBaseOptimizer.cxx +++ b/Modules/Numerics/Optimizers/src/itkRegularStepGradientDescentBaseOptimizer.cxx @@ -237,7 +237,7 @@ RegularStepGradientDescentBaseOptimizer::AdvanceOneStep() this->InvokeEvent(IterationEvent()); } -const std::string +std::string RegularStepGradientDescentBaseOptimizer::GetStopConditionDescription() const { return m_StopConditionDescription.str(); diff --git a/Modules/Numerics/Optimizers/src/itkSPSAOptimizer.cxx b/Modules/Numerics/Optimizers/src/itkSPSAOptimizer.cxx index 4d40a5ff5a6..038528e5f0b 100644 --- a/Modules/Numerics/Optimizers/src/itkSPSAOptimizer.cxx +++ b/Modules/Numerics/Optimizers/src/itkSPSAOptimizer.cxx @@ -393,7 +393,7 @@ SPSAOptimizer::GuessParameters(SizeValueType numberOfGradientEstimates, double i this->SetSa(initialStepSize * std::pow(m_A + 1.0, m_Alpha) / averageAbsoluteGradient.max_value()); } -const std::string +std::string SPSAOptimizer::GetStopConditionDescription() const { std::ostringstream reason; diff --git a/Modules/Numerics/Optimizersv4/include/itkAmoebaOptimizerv4.h b/Modules/Numerics/Optimizersv4/include/itkAmoebaOptimizerv4.h index e5b3ee327a6..26c46ec8a2d 100644 --- a/Modules/Numerics/Optimizersv4/include/itkAmoebaOptimizerv4.h +++ b/Modules/Numerics/Optimizersv4/include/itkAmoebaOptimizerv4.h @@ -134,7 +134,7 @@ class ITKOptimizersv4_EXPORT AmoebaOptimizerv4 : public SingleValuedNonLinearVnl itkGetConstMacro(FunctionConvergenceTolerance, double); /** Report the reason for stopping. */ - const std::string + std::string GetStopConditionDescription() const override; /** Method for getting access to the internal optimizer. */ diff --git a/Modules/Numerics/Optimizersv4/include/itkExhaustiveOptimizerv4.h b/Modules/Numerics/Optimizersv4/include/itkExhaustiveOptimizerv4.h index 6321adc54a6..c5386ee84d0 100644 --- a/Modules/Numerics/Optimizersv4/include/itkExhaustiveOptimizerv4.h +++ b/Modules/Numerics/Optimizersv4/include/itkExhaustiveOptimizerv4.h @@ -138,7 +138,7 @@ class ITK_TEMPLATE_EXPORT ExhaustiveOptimizerv4 itkGetConstReferenceMacro(CurrentIndex, ParametersType); /** Get the reason for termination */ - const std::string + std::string GetStopConditionDescription() const override; /** Set the position to initialize the optimization. */ diff --git a/Modules/Numerics/Optimizersv4/include/itkExhaustiveOptimizerv4.hxx b/Modules/Numerics/Optimizersv4/include/itkExhaustiveOptimizerv4.hxx index 8c34985b4e2..5682e9e2462 100644 --- a/Modules/Numerics/Optimizersv4/include/itkExhaustiveOptimizerv4.hxx +++ b/Modules/Numerics/Optimizersv4/include/itkExhaustiveOptimizerv4.hxx @@ -203,7 +203,7 @@ ExhaustiveOptimizerv4::IncrementIndex(ParametersT } template -const std::string +std::string ExhaustiveOptimizerv4::GetStopConditionDescription() const { return m_StopConditionDescription.str(); diff --git a/Modules/Numerics/Optimizersv4/include/itkGradientDescentOptimizerBasev4.h b/Modules/Numerics/Optimizersv4/include/itkGradientDescentOptimizerBasev4.h index 92f44c7e03b..ce9a486d39a 100644 --- a/Modules/Numerics/Optimizersv4/include/itkGradientDescentOptimizerBasev4.h +++ b/Modules/Numerics/Optimizersv4/include/itkGradientDescentOptimizerBasev4.h @@ -118,7 +118,7 @@ class ITK_TEMPLATE_EXPORT GradientDescentOptimizerBasev4Template StopOptimization(); /** Get the reason for termination */ - const StopConditionReturnStringType + StopConditionReturnStringType GetStopConditionDescription() const override; /** Modify the gradient in place, to advance the optimization. diff --git a/Modules/Numerics/Optimizersv4/include/itkGradientDescentOptimizerBasev4.hxx b/Modules/Numerics/Optimizersv4/include/itkGradientDescentOptimizerBasev4.hxx index 8d60afb03b4..f635b450580 100644 --- a/Modules/Numerics/Optimizersv4/include/itkGradientDescentOptimizerBasev4.hxx +++ b/Modules/Numerics/Optimizersv4/include/itkGradientDescentOptimizerBasev4.hxx @@ -81,7 +81,7 @@ GradientDescentOptimizerBasev4Template::PrintSelf template auto GradientDescentOptimizerBasev4Template::GetStopConditionDescription() const - -> const StopConditionReturnStringType + -> StopConditionReturnStringType { return this->m_StopConditionDescription.str(); } diff --git a/Modules/Numerics/Optimizersv4/include/itkLBFGS2Optimizerv4.h b/Modules/Numerics/Optimizersv4/include/itkLBFGS2Optimizerv4.h index f23febc8c3b..971fe3fe0f4 100644 --- a/Modules/Numerics/Optimizersv4/include/itkLBFGS2Optimizerv4.h +++ b/Modules/Numerics/Optimizersv4/include/itkLBFGS2Optimizerv4.h @@ -214,7 +214,7 @@ class ITK_TEMPLATE_EXPORT LBFGS2Optimizerv4Template void ResumeOptimization() override; - virtual const StopConditionReturnStringType + virtual StopConditionReturnStringType GetStopConditionDescription() const override; /** diff --git a/Modules/Numerics/Optimizersv4/include/itkLBFGS2Optimizerv4.hxx b/Modules/Numerics/Optimizersv4/include/itkLBFGS2Optimizerv4.hxx index b010c4e7d3c..f6cba844574 100644 --- a/Modules/Numerics/Optimizersv4/include/itkLBFGS2Optimizerv4.hxx +++ b/Modules/Numerics/Optimizersv4/include/itkLBFGS2Optimizerv4.hxx @@ -217,7 +217,7 @@ LBFGS2Optimizerv4Template::UpdateProgress( } template -const typename LBFGS2Optimizerv4Template::StopConditionReturnStringType +typename LBFGS2Optimizerv4Template::StopConditionReturnStringType LBFGS2Optimizerv4Template::GetStopConditionDescription() const { switch (m_StatusCode) diff --git a/Modules/Numerics/Optimizersv4/include/itkLBFGSOptimizerBasev4.h b/Modules/Numerics/Optimizersv4/include/itkLBFGSOptimizerBasev4.h index 31383fe3ea3..e94ebf81e36 100644 --- a/Modules/Numerics/Optimizersv4/include/itkLBFGSOptimizerBasev4.h +++ b/Modules/Numerics/Optimizersv4/include/itkLBFGSOptimizerBasev4.h @@ -138,7 +138,7 @@ class ITK_TEMPLATE_EXPORT LBFGSOptimizerBasev4 : public SingleValuedNonLinearVnl itkGetConstMacro(GradientConvergenceTolerance, double); /** Get the reason for termination */ - const StopConditionReturnStringType + StopConditionReturnStringType GetStopConditionDescription() const override; protected: diff --git a/Modules/Numerics/Optimizersv4/include/itkMultiGradientOptimizerv4.h b/Modules/Numerics/Optimizersv4/include/itkMultiGradientOptimizerv4.h index bed388488e3..592da0c505a 100644 --- a/Modules/Numerics/Optimizersv4/include/itkMultiGradientOptimizerv4.h +++ b/Modules/Numerics/Optimizersv4/include/itkMultiGradientOptimizerv4.h @@ -113,7 +113,7 @@ class ITK_TEMPLATE_EXPORT MultiGradientOptimizerv4Template ResumeOptimization() override; /** Get the reason for termination */ - const StopConditionReturnStringType + StopConditionReturnStringType GetStopConditionDescription() const override; /** Get the list of optimizers currently held. */ diff --git a/Modules/Numerics/Optimizersv4/include/itkMultiGradientOptimizerv4.hxx b/Modules/Numerics/Optimizersv4/include/itkMultiGradientOptimizerv4.hxx index c0e389f1c89..93ae477ab55 100644 --- a/Modules/Numerics/Optimizersv4/include/itkMultiGradientOptimizerv4.hxx +++ b/Modules/Numerics/Optimizersv4/include/itkMultiGradientOptimizerv4.hxx @@ -87,7 +87,7 @@ MultiGradientOptimizerv4Template::GetMetricValues template auto MultiGradientOptimizerv4Template::GetStopConditionDescription() const - -> const StopConditionReturnStringType + -> StopConditionReturnStringType { return this->m_StopConditionDescription.str(); } diff --git a/Modules/Numerics/Optimizersv4/include/itkMultiStartOptimizerv4.h b/Modules/Numerics/Optimizersv4/include/itkMultiStartOptimizerv4.h index b72fefc23cb..0735dbe31dc 100644 --- a/Modules/Numerics/Optimizersv4/include/itkMultiStartOptimizerv4.h +++ b/Modules/Numerics/Optimizersv4/include/itkMultiStartOptimizerv4.h @@ -127,7 +127,7 @@ class ITK_TEMPLATE_EXPORT MultiStartOptimizerv4Template ResumeOptimization(); /** Get the reason for termination */ - const StopConditionReturnStringType + StopConditionReturnStringType GetStopConditionDescription() const override; /** Get the list of parameters over which to search. */ diff --git a/Modules/Numerics/Optimizersv4/include/itkMultiStartOptimizerv4.hxx b/Modules/Numerics/Optimizersv4/include/itkMultiStartOptimizerv4.hxx index 329b5839b3e..e7282906abc 100644 --- a/Modules/Numerics/Optimizersv4/include/itkMultiStartOptimizerv4.hxx +++ b/Modules/Numerics/Optimizersv4/include/itkMultiStartOptimizerv4.hxx @@ -111,7 +111,7 @@ MultiStartOptimizerv4Template::InstantiateLocalOp template auto MultiStartOptimizerv4Template::GetStopConditionDescription() const - -> const StopConditionReturnStringType + -> StopConditionReturnStringType { return this->m_StopConditionDescription.str(); } diff --git a/Modules/Numerics/Optimizersv4/include/itkObjectToObjectOptimizerBase.h b/Modules/Numerics/Optimizersv4/include/itkObjectToObjectOptimizerBase.h index 44debe10d4f..cdcb06d9c2f 100644 --- a/Modules/Numerics/Optimizersv4/include/itkObjectToObjectOptimizerBase.h +++ b/Modules/Numerics/Optimizersv4/include/itkObjectToObjectOptimizerBase.h @@ -265,7 +265,7 @@ class ITK_TEMPLATE_EXPORT ObjectToObjectOptimizerBaseTemplate : public Object StartOptimization(bool doOnlyInitialization = false); /** Stop condition return string type */ - virtual const StopConditionReturnStringType + virtual StopConditionReturnStringType GetStopConditionDescription() const = 0; /** Returns true if derived optimizer supports using scales. diff --git a/Modules/Numerics/Optimizersv4/include/itkOnePlusOneEvolutionaryOptimizerv4.h b/Modules/Numerics/Optimizersv4/include/itkOnePlusOneEvolutionaryOptimizerv4.h index 6c5dffe56f7..c85e24decd5 100644 --- a/Modules/Numerics/Optimizersv4/include/itkOnePlusOneEvolutionaryOptimizerv4.h +++ b/Modules/Numerics/Optimizersv4/include/itkOnePlusOneEvolutionaryOptimizerv4.h @@ -165,7 +165,7 @@ class ITK_TEMPLATE_EXPORT OnePlusOneEvolutionaryOptimizerv4 itkGetConstReferenceMacro(MetricWorstPossibleValue, double); itkSetMacro(MetricWorstPossibleValue, double); - const std::string + std::string GetStopConditionDescription() const override; protected: diff --git a/Modules/Numerics/Optimizersv4/include/itkOnePlusOneEvolutionaryOptimizerv4.hxx b/Modules/Numerics/Optimizersv4/include/itkOnePlusOneEvolutionaryOptimizerv4.hxx index 6b17f6ea795..f5a909de2f1 100644 --- a/Modules/Numerics/Optimizersv4/include/itkOnePlusOneEvolutionaryOptimizerv4.hxx +++ b/Modules/Numerics/Optimizersv4/include/itkOnePlusOneEvolutionaryOptimizerv4.hxx @@ -275,7 +275,7 @@ OnePlusOneEvolutionaryOptimizerv4::StartOptimizat } template -const std::string +std::string OnePlusOneEvolutionaryOptimizerv4::GetStopConditionDescription() const { return m_StopConditionDescription.str(); diff --git a/Modules/Numerics/Optimizersv4/include/itkPowellOptimizerv4.h b/Modules/Numerics/Optimizersv4/include/itkPowellOptimizerv4.h index 0e2cbcc37d4..543e4bd7e17 100644 --- a/Modules/Numerics/Optimizersv4/include/itkPowellOptimizerv4.h +++ b/Modules/Numerics/Optimizersv4/include/itkPowellOptimizerv4.h @@ -131,7 +131,7 @@ class ITK_TEMPLATE_EXPORT PowellOptimizerv4 : public ObjectToObjectOptimizerBase itkGetConstReferenceMacro(MetricWorstPossibleValue, double); itkSetMacro(MetricWorstPossibleValue, double); - const std::string + std::string GetStopConditionDescription() const override; protected: diff --git a/Modules/Numerics/Optimizersv4/include/itkPowellOptimizerv4.hxx b/Modules/Numerics/Optimizersv4/include/itkPowellOptimizerv4.hxx index a820bf9f803..a93f3c3deb3 100644 --- a/Modules/Numerics/Optimizersv4/include/itkPowellOptimizerv4.hxx +++ b/Modules/Numerics/Optimizersv4/include/itkPowellOptimizerv4.hxx @@ -528,7 +528,7 @@ PowellOptimizerv4::StartOptimization(bool /* doOn } template -const std::string +std::string PowellOptimizerv4::GetStopConditionDescription() const { return m_StopConditionDescription.str(); diff --git a/Modules/Numerics/Optimizersv4/include/itkSingleValuedNonLinearVnlOptimizerv4.h b/Modules/Numerics/Optimizersv4/include/itkSingleValuedNonLinearVnlOptimizerv4.h index a88c0325f36..4e7aa804a1d 100644 --- a/Modules/Numerics/Optimizersv4/include/itkSingleValuedNonLinearVnlOptimizerv4.h +++ b/Modules/Numerics/Optimizersv4/include/itkSingleValuedNonLinearVnlOptimizerv4.h @@ -87,7 +87,7 @@ class ITKOptimizersv4_EXPORT SingleValuedNonLinearVnlOptimizerv4 : public Object itkGetConstReferenceMacro(CachedCurrentPosition, ParametersType); /** Get the reason for termination */ - const StopConditionReturnStringType + StopConditionReturnStringType GetStopConditionDescription() const override = 0; protected: diff --git a/Modules/Numerics/Optimizersv4/src/itkAmoebaOptimizerv4.cxx b/Modules/Numerics/Optimizersv4/src/itkAmoebaOptimizerv4.cxx index ca2c9148897..a95de2ba751 100644 --- a/Modules/Numerics/Optimizersv4/src/itkAmoebaOptimizerv4.cxx +++ b/Modules/Numerics/Optimizersv4/src/itkAmoebaOptimizerv4.cxx @@ -38,7 +38,7 @@ AmoebaOptimizerv4::AmoebaOptimizerv4() AmoebaOptimizerv4::~AmoebaOptimizerv4() = default; -const std::string +std::string AmoebaOptimizerv4::GetStopConditionDescription() const { return this->m_StopConditionDescription.str(); diff --git a/Modules/Numerics/Optimizersv4/src/itkLBFGSOptimizerv4Base.cxx b/Modules/Numerics/Optimizersv4/src/itkLBFGSOptimizerv4Base.cxx index 3d6f58d6fde..678ec825eb7 100644 --- a/Modules/Numerics/Optimizersv4/src/itkLBFGSOptimizerv4Base.cxx +++ b/Modules/Numerics/Optimizersv4/src/itkLBFGSOptimizerv4Base.cxx @@ -152,7 +152,7 @@ LBFGSOptimizerBasev4::GetOptimizer() -> InternalOptim } template -const std::string +std::string LBFGSOptimizerBasev4::GetStopConditionDescription() const { m_StopConditionDescription.str(""); diff --git a/Modules/Numerics/Optimizersv4/test/itkObjectToObjectOptimizerBaseTest.cxx b/Modules/Numerics/Optimizersv4/test/itkObjectToObjectOptimizerBaseTest.cxx index 7d330ff89a8..62cf977eb31 100644 --- a/Modules/Numerics/Optimizersv4/test/itkObjectToObjectOptimizerBaseTest.cxx +++ b/Modules/Numerics/Optimizersv4/test/itkObjectToObjectOptimizerBaseTest.cxx @@ -135,7 +135,7 @@ class ObjectToObjectOptimizerBaseTestOptimizer : public itk::ObjectToObjectOptim } /** Stop condition return string type */ - const StopConditionReturnStringType + StopConditionReturnStringType GetStopConditionDescription() const override { return std::string("Placeholder test return string");