...

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

diff --git a/lib/fpa/Base/MarksInterface.h b/lib/fpa/Base/MarksInterface.h
index b0fae7451aec19f6df1a982f660bc34979295af5..96444575d59e50bbbf27b1fa47752f6f8bc01669 100644 (file)
--- a/lib/fpa/Base/MarksInterface.h
+++ b/lib/fpa/Base/MarksInterface.h
@@ -7,7 +7,6 @@
 #define __fpa__Base__MarksInterface__h__
 
 #include <itkProcessObject.h>
-#include <vector>
 
 namespace fpa
 {
@@ -22,17 +21,6 @@ namespace fpa
       typedef _TVertex       TVertex;
       typedef MarksInterface Self;
 
-      // Minigraph to represent collisions
-      typedef std::pair< _TVertex, bool >   TCollision;
-      typedef std::vector< TCollision >     TCollisionsRow;
-      typedef std::vector< TCollisionsRow > TCollisions;
-
-    public:
-      bool StopAtOneFront( ) const;
-      void StopAtOneFrontOn( );
-      void StopAtOneFrontOff( );
-      void SetStopAtOneFront( bool v );
-
     protected:
       MarksInterface( itk::ProcessObject* filter );
       virtual ~MarksInterface( );
@@ -40,15 +28,11 @@ namespace fpa
       virtual bool _IsMarked( const TVertex& v ) const = 0;
       virtual unsigned long _GetMark( const TVertex& v ) const = 0;
       virtual void _Mark( const TVertex& v, unsigned long frontId ) = 0;
-      virtual void _FreeMarks( ) = 0;
 
       virtual void _InitMarks( unsigned long nSeeds );
-      unsigned long _Collisions( const TVertex& a, const TVertex& b );
+      virtual bool _Collisions( const TVertex& a, const TVertex& b );
 
     protected:
-      bool m_StopAtOneFront;
-      TCollisions m_Collisions;
-      unsigned int m_NumberOfFronts;
       unsigned int m_NumberOfSeeds;
       itk::ProcessObject* m_Filter;
     };