From 5a6d1e9bf8e865acc7932793bb2933948cc1da13 Mon Sep 17 00:00:00 2001 From: Krupal J S Bhat Date: Thu, 23 Jan 2025 21:51:59 +0530 Subject: [PATCH] STYLE: Modified Optimizer classes to avoid printing non-self member variables --- .../Optimizers/src/itkGradientDescentOptimizer.cxx | 6 ------ .../itkRegularStepGradientDescentBaseOptimizer.cxx | 9 --------- .../Optimizersv4/src/itkLBFGSBOptimizerv4.cxx | 12 ------------ .../Optimizersv4/src/itkLBFGSOptimizerv4.cxx | 4 ---- 4 files changed, 31 deletions(-) diff --git a/Modules/Numerics/Optimizers/src/itkGradientDescentOptimizer.cxx b/Modules/Numerics/Optimizers/src/itkGradientDescentOptimizer.cxx index cb96cd12b35..cdaa809eade 100644 --- a/Modules/Numerics/Optimizers/src/itkGradientDescentOptimizer.cxx +++ b/Modules/Numerics/Optimizers/src/itkGradientDescentOptimizer.cxx @@ -41,14 +41,8 @@ GradientDescentOptimizer::PrintSelf(std::ostream & os, Indent indent) const os << indent << "Maximize: " << m_Maximize << std::endl; os << indent << "CurrentIteration: " << m_CurrentIteration; os << indent << "Value: " << m_Value; - if (m_CostFunction) - { - os << indent << "CostFunction: " << m_CostFunction; - } os << indent << "StopCondition: " << m_StopCondition; os << std::endl; - os << indent << "Gradient: " << m_Gradient; - os << std::endl; } /** diff --git a/Modules/Numerics/Optimizers/src/itkRegularStepGradientDescentBaseOptimizer.cxx b/Modules/Numerics/Optimizers/src/itkRegularStepGradientDescentBaseOptimizer.cxx index 27203497fd3..c2ca11f2b6a 100644 --- a/Modules/Numerics/Optimizers/src/itkRegularStepGradientDescentBaseOptimizer.cxx +++ b/Modules/Numerics/Optimizers/src/itkRegularStepGradientDescentBaseOptimizer.cxx @@ -255,15 +255,6 @@ RegularStepGradientDescentBaseOptimizer::PrintSelf(std::ostream & os, Indent ind os << indent << "CurrentIteration: " << m_CurrentIteration << std::endl; os << indent << "Value: " << m_Value << std::endl; os << indent << "Maximize: " << m_Maximize << std::endl; - if (m_CostFunction) - { - os << indent << "CostFunction: " << &m_CostFunction << std::endl; - } - else - { - os << indent << "CostFunction: " - << "(None)" << std::endl; - } os << indent << "CurrentStepLength: " << m_CurrentStepLength << std::endl; os << indent << "StopCondition: " << m_StopCondition << std::endl; os << indent << "Gradient: " << m_Gradient << std::endl; diff --git a/Modules/Numerics/Optimizersv4/src/itkLBFGSBOptimizerv4.cxx b/Modules/Numerics/Optimizersv4/src/itkLBFGSBOptimizerv4.cxx index ad2b3c34250..e882d1ffc35 100644 --- a/Modules/Numerics/Optimizersv4/src/itkLBFGSBOptimizerv4.cxx +++ b/Modules/Numerics/Optimizersv4/src/itkLBFGSBOptimizerv4.cxx @@ -76,20 +76,8 @@ LBFGSBOptimizerv4::PrintSelf(std::ostream & os, Indent indent) const os << indent << "UpperBound: " << m_UpperBound << std::endl; os << indent << "BoundSelection: " << m_BoundSelection << std::endl; - os << indent << "CostFunctionConvergenceFactor: " << m_CostFunctionConvergenceFactor << std::endl; - - os << indent << "MaximumNumberOfEvaluations: " << m_MaximumNumberOfFunctionEvaluations << std::endl; - os << indent << "MaximumNumberOfCorrections: " << m_MaximumNumberOfCorrections << std::endl; - os << indent << "Value: " << this->GetValue() << std::endl; - - os << indent << "InfinityNormOfProjectedGradient: " << this->m_InfinityNormOfProjectedGradient << std::endl; - - if (this->m_VnlOptimizer) - { - os << indent << "Vnl LBFGSB Failure Code: " << this->m_VnlOptimizer->get_failure_code() << std::endl; - } } void diff --git a/Modules/Numerics/Optimizersv4/src/itkLBFGSOptimizerv4.cxx b/Modules/Numerics/Optimizersv4/src/itkLBFGSOptimizerv4.cxx index 35f2e891f69..f942be0e959 100644 --- a/Modules/Numerics/Optimizersv4/src/itkLBFGSOptimizerv4.cxx +++ b/Modules/Numerics/Optimizersv4/src/itkLBFGSOptimizerv4.cxx @@ -32,10 +32,6 @@ LBFGSOptimizerv4::PrintSelf(std::ostream & os, Indent indent) const os << indent << "LineSearchAccuracy: " << m_LineSearchAccuracy << std::endl; os << indent << "DefaultStepLength: " << m_DefaultStepLength << std::endl; - if (this->m_VnlOptimizer) - { - os << indent << "Vnl LBFGS Failure Code: " << this->m_VnlOptimizer->get_failure_code() << std::endl; - } } void