...

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

diff --git a/lib/fpa/Image/Dijkstra.h b/lib/fpa/Image/Dijkstra.h
index 37c28e808458eeed85c4713f5b8bf1a123fc36a7..d755ebfa8698bc1f1bf01a51403489d87da677a3 100644 (file)
--- a/lib/fpa/Image/Dijkstra.h
+++ b/lib/fpa/Image/Dijkstra.h
@@ -1,10 +1,15 @@
+// =========================================================================
+// @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/Image/Algorithm.h>
+#include <fpa/Image/DefaultTraits.h>
 #include <fpa/Image/MinimumSpanningTree.h>
-#include <fpa/Image/Functors/Base.h>
 
 namespace fpa
 {
@@ -12,38 +17,33 @@ namespace fpa
   {
     /**
      */
-    template< class _TInputImage, class _TOutputImage >
+    template< class _TInputImage, class _TOutputImage, class _TFrontId = unsigned char >
     class Dijkstra
-      : public fpa::Base::Dijkstra< fpa::Image::Algorithm< _TInputImage, _TOutputImage >, fpa::Image::MinimumSpanningTree< _TInputImage::ImageDimension > >
+      : public fpa::Base::Dijkstra< fpa::Image::Algorithm< fpa::Image::DefaultTraits< _TInputImage, _TOutputImage, _TFrontId > >, fpa::Image::MinimumSpanningTree< _TInputImage::ImageDimension > >
     {
     public:
-      typedef Dijkstra                                             Self;
-      typedef fpa::Image::Algorithm< _TInputImage, _TOutputImage > TAlgorithm;
+      typedef _TInputImage  TInputImage;
+      typedef _TOutputImage TOutputImage;
+      typedef _TFrontId     TFrontId;
       typedef fpa::Image::MinimumSpanningTree< _TInputImage::ImageDimension > TMST;
+
+      typedef fpa::Image::DefaultTraits< TInputImage, TOutputImage, TFrontId > TTraits;
+      typedef fpa::Image::Algorithm< TTraits >        TAlgorithm;
       typedef fpa::Base::Dijkstra< TAlgorithm, TMST > Superclass;
+      typedef Dijkstra                                Self;
       typedef itk::SmartPointer< Self >               Pointer;
       typedef itk::SmartPointer< const Self >         ConstPointer;
 
-      typedef typename Superclass::TOutput TOutput;
-      typedef typename Superclass::TVertex TVertex;
-
-      typedef fpa::Image::Functors::Base< _TInputImage, fpa::Base::DijkstraCostFunctionBase< TVertex, TOutput > > TCostFunction;
-
-    protected:
-      typedef typename Superclass::_TQueueNode _TQueueNode;
-
     public:
       itkNewMacro( Self );
       itkTypeMacro( fpa::Image::Dijkstra, fpa::Base::Dijkstra );
 
     protected:
-      Dijkstra( );
-      virtual ~Dijkstra( );
-
-      virtual void _BeforeGenerateData( ) fpa_OVERRIDE;
+      Dijkstra( ) : Superclass( ) { }
+      virtual ~Dijkstra( )        { }
 
     private:
-      // Purposely not defined
+      // Purposely not implemented.
       Dijkstra( const Self& other );
       Self& operator=( const Self& other );
     };
@@ -52,10 +52,6 @@ namespace fpa
 
 } // ecapseman
 
-#ifndef ITK_MANUAL_INSTANTIATION
-#  include <fpa/Image/Dijkstra.hxx>
-#endif // ITK_MANUAL_INSTANTIATION
-
 #endif // __fpa__Image__Dijkstra__h__
 
 // eof - $RCSfile$