...

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

diff --git a/lib/fpa/Base/RegionGrow.h b/lib/fpa/Base/RegionGrow.h
index f7f15625415ae6ef3772b71748e113782e6423fe..a8fcc932aa5dbba92883bb983b872698ad52f4c6 100644 (file)
--- a/lib/fpa/Base/RegionGrow.h
+++ b/lib/fpa/Base/RegionGrow.h
@@ -1,9 +1,9 @@
-#ifndef __FPA__BASE__REGIONGROW__H__
-#define __FPA__BASE__REGIONGROW__H__
+#ifndef __fpa__Base__RegionGrow__h__
+#define __fpa__Base__RegionGrow__h__
 
 #include <queue>
-#include <vector>
-#include <fpa/Base/Algorithm.h>
+#include <fpa/Config.h>
+#include <fpa/Base/Functors/RegionGrow/Base.h>
 
 namespace fpa
 {
@@ -11,105 +11,68 @@ namespace fpa
   {
     /**
      */
-    template< class V, class R, class VV, class VC >
-    class RegionGrowTraits
-    {
-    public:
-      typedef R  TResult;
-      typedef V  TVertex;
-      typedef VV TVertexValue;
-      typedef VC TVertexCmp;
-
-      typedef bool TCost;
-      typedef long TFrontId;
-
-      class TNode
-      {
-      public:
-        TNode( )
-          { }
-        TNode( const TVertex& v, const TFrontId& f )
-          : Vertex( v ),
-            Parent( v ),
-            FrontId( f )
-          { }
-        TNode( const TVertex& v, const TResult& r, const TFrontId& f )
-          : Vertex( v ),
-            Parent( v ),
-            Result( r ),
-            FrontId( f )
-          { }
-        virtual ~TNode( )
-          { }
-
-        TVertex Vertex;
-        TVertex Parent;
-        TResult Result;
-        TFrontId FrontId;
-      };
-
-      typedef std::vector< TNode > TNodes;
-    };
-
-    /**
-     * Region grow is a front propagation with no costs.
-     */
-    template< class V, class R, class VV, class VC, class B >
+    template< class _TSuperclass >
     class RegionGrow
-      : public Algorithm< RegionGrowTraits< V, R, VV, VC >, B >
+      : public _TSuperclass
     {
     public:
-      typedef V  TVertex;
-      typedef R  TResult;
-      typedef VV TVertexValue;
-      typedef B  TBaseFilter;
+      typedef RegionGrow                      Self;
+      typedef _TSuperclass                    Superclass;
+      typedef itk::SmartPointer< Self >       Pointer;
+      typedef itk::SmartPointer< const Self > ConstPointer;
 
-      /// Standard class typdedefs
-      typedef RegionGrowTraits< V, R, VV, VC > TTraits;
-      typedef RegionGrow                       Self;
-      typedef Algorithm< TTraits, B >          Superclass;
-      typedef itk::SmartPointer< Self >        Pointer;
-      typedef itk::SmartPointer< const Self >  ConstPointer;
+      typedef typename Superclass::TOutput TOutput;
+      typedef typename Superclass::TVertex TVertex;
 
-      typedef typename TTraits::TCost TCost;
+      typedef fpa::Base::Functors::RegionGrow::Base< TVertex > TGrowFunction;
 
     protected:
-      typedef typename TTraits::TFrontId  _TFrontId;
-      typedef typename TTraits::TNode     _TNode;
-      typedef typename TTraits::TNodes    _TNodes;
-      typedef std::queue< _TNode >        _TQueue;
+      typedef typename Superclass::_TQueueNode _TQueueNode;
+      typedef std::queue< _TQueueNode > _TQueue;
 
     public:
       itkTypeMacro( RegionGrow, Algorithm );
 
+      itkGetObjectMacro( GrowFunction, TGrowFunction );
+      itkGetConstMacro( InsideValue, TOutput );
+      itkGetConstMacro( OutsideValue, TOutput );
+
+      itkSetObjectMacro( GrowFunction, TGrowFunction );
+      itkSetMacro( InsideValue, TOutput );
+      itkSetMacro( OutsideValue, TOutput );
+
     protected:
       RegionGrow( );
       virtual ~RegionGrow( );
 
-      virtual   bool _UpdateResult    ( _TNode& n );
-      virtual   void _InitializeQueue ( );
-      virtual   bool _IsQueueEmpty    ( ) const;
-      virtual   void _QueuePush       ( const _TNode& n );
-      virtual _TNode _QueuePop        ( );
-      virtual   void _QueueClear      ( );
-      virtual   bool _UpdateNeigh     ( _TNode& nn, const _TNode& n );
-
-      virtual bool _CheckMembership( const _TNode& n ) const = 0;
+      virtual bool _UpdateValue(
+        _TQueueNode& v, const _TQueueNode& p
+        ) override;
+      virtual unsigned long _QueueSize( ) const override;
+      virtual void _QueueClear( ) override;
+      virtual void _QueuePush( const _TQueueNode& node ) override;
+      virtual _TQueueNode _QueuePop( ) override;
 
     private:
-      RegionGrow( const Self& );     // Not impl.
-      void operator=( const Self& ); // Not impl.
+      // Purposely not defined
+      RegionGrow( const Self& other );
+      Self& operator=( const Self& other );
 
     protected:
+      TOutput m_InsideValue;
+      TOutput m_OutsideValue;
       _TQueue m_Queue;
+      typename TGrowFunction::Pointer m_GrowFunction;
     };
 
   } // ecapseman
 
 } // ecapseman
 
-#include <fpa/Base/RegionGrow.hxx>
+#ifndef ITK_MANUAL_INSTANTIATION
+#  include <fpa/Base/RegionGrow.hxx>
+#endif // ITK_MANUAL_INSTANTIATION
 
-#endif // __FPA__BASE__REGIONGROW__H__
+#endif // __fpa__Base__RegionGrow__h__
 
 // eof - $RCSfile$