X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2Ffpa%2FImage%2FAlgorithm.h;h=6bed9adc858a68b142aca6effff34065fef065a5;hb=c9542e420b94b0bfc1f285599f7816eab1191519;hp=efb376b974e5d3ef726edea76f7afe490effb7f5;hpb=b4ed6ddfa7e90e892f07cad9a760961bd4e84e6b;p=FrontAlgorithms.git

diff --git a/lib/fpa/Image/Algorithm.h b/lib/fpa/Image/Algorithm.h
index efb376b..6bed9ad 100644
--- a/lib/fpa/Image/Algorithm.h
+++ b/lib/fpa/Image/Algorithm.h
@@ -1,93 +1,125 @@
-#ifndef __FPA__IMAGE__ALGORITHM__H__
-#define __FPA__IMAGE__ALGORITHM__H__
+// =========================================================================
+// @author Leonardo Florez Valencia
+// @email florez-l@javeriana.edu.co
+// =========================================================================
+
+#ifndef __fpa__Image__Algorithm__h__
+#define __fpa__Image__Algorithm__h__
 
 #include <itkImage.h>
+#include <itkImageToImageFilter.h>
+#include <fpa/Base/Algorithm.h>
 
 namespace fpa
 {
   namespace Image
   {
     /**
-     * A generic front propagation algorithm were vertices are image pixels.
-     *
-     * @param I Input image type
-     * @param O Output image type
-     * @param A Base algorithm (RegionGrow, Dijkstra or FastMarching)
      */
-    template< class I, class O, class A >
+    template< class _TTraits, class _TMarks, class _TSeeds >
     class Algorithm
-      : public A
+      : public fpa::Base::Algorithm< itk::ImageToImageFilter< typename _TTraits::TInputImage, typename _TTraits::TOutputImage >, _TMarks, _TSeeds >
     {
     public:
-      /// Standard class typdedefs
+      typedef _TTraits TTraits;
+      typedef _TMarks  TMarksInterface;
+      typedef _TSeeds  TSeedsInterface;
+      typedef typename TTraits::TInputImage  TInputImage;
+      typedef typename TTraits::TOutputImage TOutputImage;
+      typedef itk::ImageToImageFilter< TInputImage, TOutputImage > TFilter;
+
+      typedef fpa::Base::Algorithm< TFilter, TMarksInterface, TSeedsInterface > Superclass;
       typedef Algorithm                       Self;
-      typedef A                               Superclass;
       typedef itk::SmartPointer< Self >       Pointer;
       typedef itk::SmartPointer< const Self > ConstPointer;
 
-      /// Template input values
-      typedef I TInputImage;
-      typedef O TOutputImage;
-
-      typedef typename Superclass::TVertex              TVertex;
-      typedef typename Superclass::TValue               TValue;
-      typedef typename Superclass::TResult              TResult;
-      typedef typename Superclass::TVertexCompare       TVertexCompare;
-      typedef typename Superclass::TMinimumSpanningTree TMinimumSpanningTree;
+      fpa_Base_TraitTypes( typename TTraits );
+
+      /* TODO
+         typedef typename TTraits::TFrontId      TFrontId;
+         typedef typename TTraits::TInputImage   TInputImage;
+         typedef typename TTraits::TInputValue   TInputValue;
+         typedef typename TTraits::TNeighborhood TNeighborhood;
+         typedef typename TTraits::TNode         TNode;
+         typedef typename TTraits::TNodes        TNodes;
+         typedef typename TTraits::TOutputImage  TOutputImage;
+         typedef typename TTraits::TOutputValue  TOutputValue;
+         typedef typename TTraits::TSeeds        TSeeds;
+         typedef typename TTraits::TVertex       TVertex;
+      */
+
+      typedef itk::Image< TFrontId, TTraits::Dimension > TMarks;
+
+      /* TODO
+         typedef _TMarksInterface TMarksInterface;
+         typedef _TSeedsInterface TSeedsInterface;
+
+         typedef typename TSeedsInterface::TTraits TTraits;
+         typedef typename TTraits::TInputImage   TInputImage;
+         typedef typename TTraits::TOutputImage  TOutputImage;
+         typedef typename TTraits::TInputValue   TInputValue;
+         typedef typename TTraits::TOutputValue  TOutputValue;
+         typedef typename TTraits::TFrontId      TFrontId;
+         typedef typename TTraits::TNeighborhood TNeighborhood;
+         typedef typename TTraits::TNode         TNode;
+         typedef typename TTraits::TNodes        TNodes;
+         typedef typename TTraits::TSeeds        TSeeds;
+         typedef typename TTraits::TVertex       TVertex;
+         typedef typename TTraits::TPoint        TPoint;
+
+         typedef itk::ImageToImageFilter< TInputImage, TOutputImage > TFilter;
+         typedef fpa::Base::Algorithm< TFilter, TMarksInterface, TSeedsInterface > Superclass;
+         typedef Algorithm                       Self;
+      */
 
-    protected:
-      typedef typename Superclass::_TVertices      _TVertices;
-      typedef typename Superclass::_TCollision     _TCollision;
-      typedef typename Superclass::_TCollisionsRow _TCollisionsRow;
-      typedef typename Superclass::_TCollisions    _TCollisions;
-      typedef typename Superclass::_TNode          _TNode;
-      typedef typename Superclass::_TNodes         _TNodes;
+    private:
+      itkConceptMacro(
+        Marks_SameTraits,
+        ( itk::Concept::SameType< typename _TMarks::TTraits, TTraits > )
+        );
 
     public:
-      itkTypeMacro( Algorithm, TAlgorithm );
+      itkTypeMacro( fpa::Image::Algorithm, fpa::Base::Algorithm );
+
+      itkGetConstMacro( NeigborhoodOrder, unsigned int );
+      itkSetMacro( NeigborhoodOrder, unsigned int );
 
-      /// Set/Get
-      itkGetConstMacro( NeighborhoodOrder, unsigned int );
-      itkSetMacro( NeighborhoodOrder, unsigned int );
+    public:
+      TMarks* GetMarks( );
+      const TMarks* GetMarks( ) const;
 
     protected:
       Algorithm( );
       virtual ~Algorithm( );
 
-      virtual void _BeforeGenerateData( );
-      virtual void _AfterGenerateData( );
-
-      // Graph-related abstract methods
-      virtual unsigned long _NumberOfVertices( ) const;
-      virtual const TValue& _VertexValue( const TVertex& v ) const;
-      virtual double _Distance(
-        const TVertex& a, const TVertex& b
-        ) const;
-      virtual bool _HasEdge( const TVertex& a, const TVertex& b ) const;
-      virtual void _Neighborhood(
-        _TVertices& neighborhood, const TVertex& v
-        ) const;
-
-      // Results-related abstract methods
-      virtual void _InitResults( );
-      virtual const TResult& _Result( const TVertex& v ) const;
-      virtual void _SetResult( const TVertex& v, const _TNode& n );
+      virtual TNodes _UnifySeeds( ) override;
+      virtual void _ConfigureOutput( const TOutputValue& v ) override;
+      virtual TNeighborhood _GetNeighbors( const TVertex& v ) const override;
+      virtual TInputValue _GetInputValue( const TVertex& v ) const override;
+      virtual TOutputValue _GetOutputValue( const TVertex& v ) const override;
+      virtual void _UpdateOutputValue( TNode& n ) override;
+      virtual bool _IsMarked( const TVertex& v ) const override;
+      virtual unsigned long _GetMark( const TVertex& v ) const override;
+      virtual void _Mark( const TVertex& v, unsigned long frontId ) override;
 
     private:
-      // Purposely not implemented
+      // Purposely not implemented.
       Algorithm( const Self& other );
       Self& operator=( const Self& other );
 
     protected:
-      unsigned int m_NeighborhoodOrder;
+      unsigned long m_MarksIdx;
+      unsigned int  m_NeigborhoodOrder;
     };
 
   } // ecapseman
 
 } // ecapseman
 
-#include <fpa/Image/Algorithm.hxx>
+#ifndef ITK_MANUAL_INSTANTIATION
+#  include <fpa/Image/Algorithm.hxx>
+#endif // ITK_MANUAL_INSTANTIATION
 
-#endif // __FPA__IMAGE__ALGORITHM__H__
+#endif // __fpa__Image__Algorithm__h__
 
 // eof - $RCSfile$