...

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

diff --git a/lib/fpa/Base/Algorithm.h b/lib/fpa/Base/Algorithm.h
index 246a5e3215f34173a5cbdf3cbe6a5c6acd96f160..4d8570f29d55cb95fc2b721f90b53e3fbae04d42 100644 (file)
--- a/lib/fpa/Base/Algorithm.h
+++ b/lib/fpa/Base/Algorithm.h
@@ -5,7 +5,6 @@
 #include <utility>
 #include <vector>
 #include <fpa/Base/Events.h>
-#include <fpa/Base/MinimumSpanningTree.h>
 
 namespace fpa
 {
@@ -84,9 +83,6 @@ namespace fpa
       };
       typedef std::map< TVertex, _TNode, TVertexCompare > _TNodes;
 
-    public:
-      typedef fpa::Base::MinimumSpanningTree< V, VC > TMinimumSpanningTree;
-
     public:
       itkTypeMacro( Algorithm, B );
 
@@ -100,10 +96,6 @@ namespace fpa
       itkSetMacro( StopAtOneFront, bool );
 
     public:
-      TMinimumSpanningTree* GetMinimumSpanningTree( );
-      const TMinimumSpanningTree* GetMinimumSpanningTree( ) const;
-      void GraftMinimumSpanningTree( itk::DataObject* obj );
-
       virtual void InvokeEvent( const itk::EventObject& e );
       virtual void InvokeEvent( const itk::EventObject& e ) const;
 
@@ -149,7 +141,7 @@ namespace fpa
         ) const = 0;
       virtual void _InitResults( ) = 0;
       virtual const TResult& _Result( const TVertex& v ) const = 0;
-      virtual void _SetResult( const TVertex& v, const _TNode& n ) = 0;
+      virtual void _SetResult( const TVertex& v, const _TNode& n );
 
       // Marks-related abstract methods
       virtual _TNode& _Node( const TVertex& v );
@@ -176,15 +168,15 @@ namespace fpa
       _TVertices   m_SeedVertices;
       _TNodes      m_Marks;
       _TCollisions m_Collisions;
-
-      unsigned int m_MinimumSpanningTreeIndex;
     };
 
   } // ecapseman
 
 } // ecapseman
 
+#ifndef ITK_MANUAL_INSTANTIATION
 #include <fpa/Base/Algorithm.hxx>
+#endif // ITK_MANUAL_INSTANTIATION
 
 #endif // __FPA__BASE__ALGORITHM__H__