...

[FrontAlgorithms.git] / lib / fpa / Image / Algorithm.h

diff --git a/lib/fpa/Image/Algorithm.h b/lib/fpa/Image/Algorithm.h
index 9a44146ddee238464b799a7faa236554273dedd5..6d68bb58786aa9703a44d9c37da518be7fc4e584 100644 (file)
--- a/lib/fpa/Image/Algorithm.h
+++ b/lib/fpa/Image/Algorithm.h
@@ -29,12 +29,11 @@ namespace fpa
       typedef I TInputImage;
       typedef O TOutputImage;
 
-      typedef typename Superclass::TVertex              TVertex;
-      typedef typename Superclass::TValue               TValue;
-      typedef typename Superclass::TResult              TResult;
-      typedef typename Superclass::TSpace               TSpace;
-      typedef typename Superclass::TVertexCompare       TVertexCompare;
-      typedef typename Superclass::TMinimumSpanningTree TMinimumSpanningTree;
+      typedef typename Superclass::TVertex        TVertex;
+      typedef typename Superclass::TValue         TValue;
+      typedef typename Superclass::TResult        TResult;
+      typedef typename Superclass::TSpace         TSpace;
+      typedef typename Superclass::TVertexCompare TVertexCompare;
 
     protected:
       typedef typename Superclass::_TVertices      _TVertices;
@@ -55,24 +54,23 @@ namespace fpa
       Algorithm( );
       virtual ~Algorithm( );
 
-      virtual void _BeforeGenerateData( );
-      virtual void _AfterGenerateData( );
+      virtual void _BeforeGenerateData( ) ITK_OVERRIDE;
 
       // Graph-related abstract methods
-      virtual unsigned long _NumberOfVertices( ) const;
-      virtual const TValue& _VertexValue( const TVertex& v ) const;
+      virtual unsigned long _NumberOfVertices( ) const ITK_OVERRIDE;
+      virtual const TValue& _VertexValue( const TVertex& v ) const ITK_OVERRIDE;
       virtual double _Distance(
         const TVertex& a, const TVertex& b
-        ) const;
-      virtual bool _HasEdge( const TVertex& a, const TVertex& b ) const;
+        ) const ITK_OVERRIDE;
+      virtual bool _HasEdge( const TVertex& a, const TVertex& b ) const ITK_OVERRIDE;
       virtual void _Neighborhood(
         _TVertices& neighborhood, const TVertex& v
-        ) const;
+        ) const ITK_OVERRIDE;
 
       // Results-related abstract methods
-      virtual void _InitResults( );
-      virtual const TResult& _Result( const TVertex& v ) const;
-      virtual void _SetResult( const TVertex& v, const _TNode& n );
+      virtual void _InitResults( ) ITK_OVERRIDE;
+      virtual const TResult& _Result( const TVertex& v ) const ITK_OVERRIDE;
+      virtual void _SetResult( const TVertex& v, const _TNode& n ) ITK_OVERRIDE;
 
     private:
       // Purposely not implemented
@@ -87,7 +85,9 @@ namespace fpa
 
 } // ecapseman
 
+#ifndef ITK_MANUAL_INSTANTIATION
 #include <fpa/Image/Algorithm.hxx>
+#endif // ITK_MANUAL_INSTANTIATION
 
 #endif // __FPA__IMAGE__ALGORITHM__H__