...

[FrontAlgorithms.git] / lib / fpa / Image / Dijkstra.h

diff --git a/lib/fpa/Image/Dijkstra.h b/lib/fpa/Image/Dijkstra.h
index 5c2460f97515357f743015919f5e677d17da3505..4262f7f4b9d8e903d5c017fe64b1b59fb306c31b 100644 (file)
--- a/lib/fpa/Image/Dijkstra.h
+++ b/lib/fpa/Image/Dijkstra.h
@@ -1,8 +1,18 @@
-#ifndef __FPA__IMAGE__DIJKSTRA__H__
-#define __FPA__IMAGE__DIJKSTRA__H__
+// =========================================================================
+// @author Leonardo Florez Valencia
+// @email florez-l@javeriana.edu.co
+// =========================================================================
+
+#ifndef __fpa__Image__Dijkstra__h__
+#define __fpa__Image__Dijkstra__h__
 
 #include <fpa/Base/Dijkstra.h>
+#include <fpa/Base/MarksInterfaceWithCollisions.h>
+#include <fpa/Base/SeedsInterface.h>
 #include <fpa/Image/Algorithm.h>
+#include <fpa/Image/DefaultTraits.h>
+#include <fpa/Image/MinimumSpanningTree.h>
+#include <fpa/Image/Functors/Dijkstra/Function.h>
 
 namespace fpa
 {
@@ -10,54 +20,43 @@ namespace fpa
   {
     /**
      */
-    template< class _TInputImage, class _TOutputImage = _TInputImage >
+    template< class _TInputImage, class _TOutputImage, class _TFrontId = unsigned char, class _TTraits = fpa::Image::DefaultTraits< _TInputImage, _TOutputImage, _TFrontId > >
     class Dijkstra
-      : public fpa::Base::Dijkstra< fpa::Image::Algorithm< _TInputImage, _TOutputImage > >
+      : public fpa::Base::Dijkstra< fpa::Image::Algorithm< _TTraits, fpa::Base::MarksInterfaceWithCollisions< _TTraits >, fpa::Base::SeedsInterface< _TTraits > >, fpa::Image::MinimumSpanningTree< _TInputImage::ImageDimension > >
     {
     public:
-      typedef fpa::Base::Dijkstra< fpa::Image::Algorithm< _TInputImage, _TOutputImage > > Superclass;
-      typedef Dijkstra                        Self;
-      typedef itk::SmartPointer< Self >       Pointer;
-      typedef itk::SmartPointer< const Self > ConstPointer;
+      typedef _TInputImage  TInputImage;
+      typedef _TOutputImage TOutputImage;
+      typedef _TTraits      TTraits;
+      typedef fpa::Base::MarksInterfaceWithCollisions< TTraits > TMarksInterface;
+      typedef fpa::Base::SeedsInterface< TTraits > TSeedsInterface;
+      typedef fpa::Image::MinimumSpanningTree< _TInputImage::ImageDimension > TMST;
+
+      typedef fpa::Image::Algorithm< TTraits, TMarksInterface, TSeedsInterface > TAlgorithm;
+      typedef fpa::Base::Dijkstra< TAlgorithm, TMST > Superclass;
+      typedef Dijkstra                                Self;
+      typedef itk::SmartPointer< Self >               Pointer;
+      typedef itk::SmartPointer< const Self >         ConstPointer;
+
+      fpa_Base_TraitTypes( typename TTraits );
 
-      // Template arguments
-      typedef typename Superclass::TVertex        TVertex;
-      typedef typename Superclass::TScalar        TScalar;
-      typedef typename Superclass::TFilter        TFilter;
-      typedef typename Superclass::TVertexCompare TVertexCompare;
-      typedef typename Superclass::TFrontId       TFrontId;
-      typedef typename Superclass::TCollision     TCollision;
-      typedef typename Superclass::TCollisionsRow TCollisionsRow;
-      typedef typename Superclass::TCollisions    TCollisions;
-      typedef typename Superclass::TNodeLabel     TNodeLabel;
-      typedef typename Superclass::TNode          TNode;
-      typedef typename Superclass::TNodes         TNodes;
-      typedef typename Superclass::TVertices      TVertices;
+      typedef fpa::Image::Functors::Dijkstra::Function< TInputImage, TOutputValue > TWeightFunction;
 
     public:
       itkNewMacro( Self );
-      itkTypeMacro( Dijkstra, fpa::Base::Dijkstra );
-
-      itkBooleanMacro( UseImageSpacing );
-      itkGetConstMacro( UseImageSpacing, bool );
-      itkSetMacro( UseImageSpacing, bool );
+      itkTypeMacro( fpa::Image::Dijkstra, fpa::Base::Dijkstra );
 
     protected:
       Dijkstra( );
       virtual ~Dijkstra( );
 
-      // Dijkstra methods to be overloaded
-      virtual TScalar _Cost(
-        const TVertex& a, const TVertex& b
-        ) const fpa_OVERRIDE;
+      virtual void _BeforeGenerateData( ) override;
+      virtual void _ConfigureOutput( const TOutputValue& v ) override;
 
     private:
-      // Purposely not implemented
+      // Purposely not implemented.
       Dijkstra( const Self& other );
       Self& operator=( const Self& other );
-
-    protected:
-      bool m_UseImageSpacing;
     };
 
   } // ecapseman
@@ -66,8 +65,8 @@ namespace fpa
 
 #ifndef ITK_MANUAL_INSTANTIATION
 #  include <fpa/Image/Dijkstra.hxx>
-#endif
+#endif // ITK_MANUAL_INSTANTIATION
 
-#endif // __FPA__IMAGE__DIJKSTRA__H__
+#endif // __fpa__Image__Dijkstra__h__
 
 // eof - $RCSfile$