X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=registration%2FclitkLBFGSBOptimizer.h;h=4ea8924b270a95c8bd5553a4a84ad2ca6386dd1b;hb=b7b8f2b040d1772c30c34653ee3fe0c27bc8fa71;hp=8eec63a1f32046891728d3cfc7c29cad4e3666b7;hpb=573d80d0f7a17607d2ee883c21c940c0ba020282;p=clitk.git

diff --git a/registration/clitkLBFGSBOptimizer.h b/registration/clitkLBFGSBOptimizer.h
index 8eec63a..4ea8924 100644
--- a/registration/clitkLBFGSBOptimizer.h
+++ b/registration/clitkLBFGSBOptimizer.h
@@ -19,6 +19,8 @@
 #define __clitkLBFGSBOptimizer_h
 #include "itkSingleValuedNonLinearVnlOptimizer.h"
 
+#include "clitkCommon.h"
+
 namespace clitk
 {
 
@@ -93,10 +95,10 @@ public:
 
 
   /** Start optimization with an initial value. */
-  void StartOptimization( void );
+  virtual void StartOptimization( void ) ITK_OVERRIDE;
 
   /** Plug in a Cost Function into the optimizer  */
-  virtual void SetCostFunction( itk::SingleValuedCostFunction * costFunction );
+  virtual void SetCostFunction( itk::SingleValuedCostFunction * costFunction ) ITK_OVERRIDE;
 
   /** Set the lower bound value for each variable. */
   virtual void SetLowerBound( const BoundValueType & value );
@@ -160,12 +162,12 @@ public:
   itkGetConstReferenceMacro( InfinityNormOfProjectedGradient, double );
 
   /** Get the reason for termination */
-  const std::string GetStopConditionDescription() const;
+  virtual const std::string GetStopConditionDescription() const ITK_OVERRIDE;
 
 protected:
   LBFGSBOptimizer();
   virtual ~LBFGSBOptimizer();
-  void PrintSelf(std::ostream& os, itk::Indent indent) const;
+  void PrintSelf(std::ostream& os, itk::Indent indent) const ITK_OVERRIDE;
 
   typedef Superclass::CostFunctionAdaptorType   CostFunctionAdaptorType;
 
@@ -179,11 +181,7 @@ private:
 
   bool                     m_OptimizerInitialized;
   InternalOptimizerType  * m_VnlOptimizer;
-#if ITK_VERSION_MAJOR > 3
   mutable std::ostringstream    m_StopConditionDescription;
-#else
-  mutable itk::OStringStream    m_StopConditionDescription;
-#endif
   BoundValueType           m_LowerBound;
   BoundValueType           m_UpperBound;
   BoundSelectionType       m_BoundSelection;