Almost there...

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

diff --git a/lib/fpa/Image/Algorithm.h b/lib/fpa/Image/Algorithm.h
index e59bed2311c19912e26c6d75df7aa6c91079f7d9..f9ec7c479ff9187e97e7ff37a7a94c715f465f9b 100644 (file)
--- a/lib/fpa/Image/Algorithm.h
+++ b/lib/fpa/Image/Algorithm.h
@@ -2,7 +2,6 @@
 #define __FPA__IMAGE__ALGORITHM__H__
 
 #include <itkImage.h>
-#include <fpa/Image/MinimumSpanningTree.h>
 
 namespace fpa
 {
@@ -30,9 +29,10 @@ 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;
 
     protected:
       typedef typename Superclass::_TVertices      _TVertices;
@@ -42,11 +42,6 @@ namespace fpa
       typedef typename Superclass::_TNode          _TNode;
       typedef typename Superclass::_TNodes         _TNodes;
 
-      typedef fpa::Image::MinimumSpanningTree< TVertex, _TNode, _TCollisions, I::ImageDimension, Self::AliveLabel > _TMarks;
-
-    public:
-      typedef _TMarks TMinimumSpanningTree;
-
     public:
       itkTypeMacro( Algorithm, TAlgorithm );
 
@@ -54,11 +49,6 @@ namespace fpa
       itkGetConstMacro( NeighborhoodOrder, unsigned int );
       itkSetMacro( NeighborhoodOrder, unsigned int );
 
-    public:
-      TMinimumSpanningTree* GetMinimumSpanningTree( );
-      const TMinimumSpanningTree* GetMinimumSpanningTree( ) const;
-      void GraftMinimumSpanningTree( itk::DataObject* obj );
-
     protected:
       Algorithm( );
       virtual ~Algorithm( );
@@ -80,12 +70,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