X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2Ffpa%2FImage%2FAlgorithm.h;h=efb376b974e5d3ef726edea76f7afe490effb7f5;hb=b4ed6ddfa7e90e892f07cad9a760961bd4e84e6b;hp=cd218a6ff0d9ef1eaae6694206a27a37d126237b;hpb=b70a564ee2d7bc180b77a05c37ab431ab9c393e7;p=FrontAlgorithms.git

diff --git a/lib/fpa/Image/Algorithm.h b/lib/fpa/Image/Algorithm.h
index cd218a6..efb376b 100644
--- a/lib/fpa/Image/Algorithm.h
+++ b/lib/fpa/Image/Algorithm.h
@@ -29,9 +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::TVertex              TVertex;
+      typedef typename Superclass::TValue               TValue;
+      typedef typename Superclass::TResult              TResult;
+      typedef typename Superclass::TVertexCompare       TVertexCompare;
+      typedef typename Superclass::TMinimumSpanningTree TMinimumSpanningTree;
 
     protected:
       typedef typename Superclass::_TVertices      _TVertices;
@@ -41,8 +43,6 @@ namespace fpa
       typedef typename Superclass::_TNode          _TNode;
       typedef typename Superclass::_TNodes         _TNodes;
 
-      typedef itk::Image< _TNode, I::ImageDimension > _TMarks;
-
     public:
       itkTypeMacro( Algorithm, TAlgorithm );
 
@@ -55,6 +55,7 @@ namespace fpa
       virtual ~Algorithm( );
 
       virtual void _BeforeGenerateData( );
+      virtual void _AfterGenerateData( );
 
       // Graph-related abstract methods
       virtual unsigned long _NumberOfVertices( ) const;
@@ -70,12 +71,7 @@ namespace fpa
       // Results-related abstract methods
       virtual void _InitResults( );
       virtual const TResult& _Result( const TVertex& v ) const;
-      virtual void _SetResult( const TVertex& v, const TResult& r );
-
-      // Marks-related abstract methods
-      virtual const _TNode& _Node( const TVertex& v ) const;
-      virtual void _InitMarks( );
-      virtual void _Mark( const _TNode& node );
+      virtual void _SetResult( const TVertex& v, const _TNode& n );
 
     private:
       // Purposely not implemented
@@ -84,7 +80,6 @@ namespace fpa
 
     protected:
       unsigned int m_NeighborhoodOrder;
-      typename _TMarks::Pointer m_Marks;
     };
 
   } // ecapseman