...

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

diff --git a/lib/fpa/Base/SeedsInterface.h b/lib/fpa/Base/SeedsInterface.h
index 61860cc5fd66570b868ca351795248b1e736bfe3..d556f3aed3017b78411d48d12aabeff3188f8192 100644 (file)
--- a/lib/fpa/Base/SeedsInterface.h
+++ b/lib/fpa/Base/SeedsInterface.h
@@ -6,10 +6,7 @@
 #ifndef __fpa__Base__SeedsInterface__h__
 #define __fpa__Base__SeedsInterface__h__
 
-#include <functional>
-#include <set>
-#include <vector>
-
+#include <fpa/Config.h>
 #include <itkConceptChecking.h>
 #include <itkProcessObject.h>
 
@@ -19,57 +16,20 @@ namespace fpa
   {
     /**
      */
-    template< class _TVertex, class _TPoint, class _TInputValue, class _TOutputValue, class _TFrontId, class _TCompare = std::greater< _TVertex > >
+    template< class _TTraits >
     class SeedsInterface
     {
     public:
+      typedef SeedsInterface Self;
+      typedef _TTraits       TTraits;
+      fpa_Base_TraitTypes( typename TTraits );
+
+    private:
       itkConceptMacro(
         Check_TFrontId,
-        ( itk::Concept::IsUnsignedInteger< _TFrontId > )
+        ( itk::Concept::IsUnsignedInteger< TFrontId > )
         );
 
-    public:
-      typedef _TVertex       TVertex;
-      typedef _TPoint        TPoint;
-      typedef _TInputValue   TInputValue;
-      typedef _TOutputValue  TOutputValue;
-      typedef _TFrontId      TFrontId;
-      typedef _TCompare      TCompare;
-      typedef SeedsInterface Self;
-
-      struct TSeed
-      {
-        TVertex Vertex;
-        TPoint  Point;
-        bool    IsPoint;
-        bool    IsUnified;
-        TFrontId FrontId;
-        TSeed( )
-          : IsUnified( false ),
-            FrontId( TFrontId( 0 ) )
-          { }
-      };
-      typedef std::vector< TSeed > TSeeds;
-
-      struct TNode
-      {
-        TVertex  Vertex;
-        TVertex  Parent;
-        TFrontId FrontId;
-
-        // Hack to hide the fact that seed values need to be initialized
-        mutable TOutputValue Value;
-      };
-      struct TNodeCompare
-      {
-        bool operator()( const TNode& a, const TNode& b ) const
-          {
-            TCompare cmp;
-            return( cmp( a.Vertex, b.Vertex ) );
-          }
-      };
-      typedef std::set< TNode, TNodeCompare > TNodes;
-
     public:
       TSeeds& GetSeeds( );
       const TSeeds& GetSeeds( ) const;