X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2Ffpa%2FBase%2FDijkstra.h;h=c93d575c927c176c41a79bdaf22755e8594ec130;hb=479d85a44365c8aa01976ffb9c7d67d3e9e52b63;hp=d231c7c41da897886b69c63d97f0fca117908646;hpb=f287dfe5d76525d02c37224c0a09ed6277fbbb52;p=FrontAlgorithms.git

diff --git a/lib/fpa/Base/Dijkstra.h b/lib/fpa/Base/Dijkstra.h
index d231c7c..c93d575 100644
--- a/lib/fpa/Base/Dijkstra.h
+++ b/lib/fpa/Base/Dijkstra.h
@@ -6,9 +6,7 @@
 #ifndef __fpa__Base__Dijkstra__h__
 #define __fpa__Base__Dijkstra__h__
 
-#include <itkFunctionBase.h>
-#include <fpa/Base/MinimumSpanningTree.h>
-#include <fpa/Base/Functors/VertexParentBase.h>
+#include <fpa/Base/DijkstraBase.h>
 
 namespace fpa
 {
@@ -16,76 +14,48 @@ namespace fpa
   {
     /**
      */
-    template< class _TFilter, class _TMarksInterface, class _TSeedsInterface, class _TMST >
+    template< class _TAlgorithm, class _TMST >
     class Dijkstra
-      : public _TFilter,
-        public _TMarksInterface,
-        public _TSeedsInterface
+      : public fpa::Base::DijkstraBase< _TAlgorithm >
     {
     public:
-      typedef Dijkstra                        Self;
-      typedef _TFilter                        Superclass;
-      typedef _TMarksInterface                TMarksInterface;
-      typedef _TSeedsInterface                TSeedsInterface;
-      typedef _TMST                           TMST;
-      typedef itk::SmartPointer< Self >       Pointer;
-      typedef itk::SmartPointer< const Self > ConstPointer;
+      typedef Dijkstra                               Self;
+      typedef fpa::Base::DijkstraBase< _TAlgorithm > Superclass;
+      typedef itk::SmartPointer< Self >              Pointer;
+      typedef itk::SmartPointer< const Self >        ConstPointer;
 
+      typedef _TMST TMST;
+
+      typedef typename Superclass::TNode        TNode;
+      typedef typename Superclass::TNodes       TNodes;
       typedef typename Superclass::TInputValue  TInputValue;
       typedef typename Superclass::TOutputValue TOutputValue;
+      typedef typename Superclass::TFrontId     TFrontId;
       typedef typename Superclass::TVertex      TVertex;
-      typedef typename Superclass::TVertices    TVertices;
-
-      typedef itk::FunctionBase< TInputValue, TOutputValue > TIntensityFunctor;
-      typedef fpa::Base::Functors::VertexParentBase< TVertex, TOutputValue > TVertexFunctor;
+      typedef typename Superclass::TSeeds       TSeeds;
 
-    protected:
-      struct _TNode
-      {
-        TVertex Vertex;
-        TVertex Parent;
-        TOutputValue Cost;
-        unsigned long FrontId;
-        _TNode( const TVertex& v, const TVertex& p, const unsigned long& fId )
-          {
-            this->Vertex = v;
-            this->Parent = p;
-            this->FrontId = fId;
-            this->Cost = TOutputValue( 0 );
-          }
-        bool operator<( const _TNode& b ) const
-          {
-            return( b.Cost < this->Cost );
-          }
-      };
-
-    public:
-      itkTypeMacro( Dijkstra, TFilter );
+      typedef typename Superclass::TQueue          TQueue;
+      typedef typename Superclass::TQueueOrder     TQueueOrder;
+      typedef typename Superclass::TWeightFunction TWeightFunction;
 
     public:
       TMST* GetMinimumSpanningTree( );
       const TMST* GetMinimumSpanningTree( ) const;
 
-      const TIntensityFunctor* GetIntensityFunctor( ) const;
-      const TVertexFunctor* GetVertexFunctor( ) const;
-
-      void SetFunctor( TIntensityFunctor* functor );
-      void SetFunctor( TVertexFunctor* functor );
-
     protected:
       Dijkstra( );
       virtual ~Dijkstra( );
 
-      virtual void GenerateData( ) override;
+      virtual void _AfterGenerateData( ) override;
+      virtual void _UpdateOutputValue( const TNode& n ) override;
 
     private:
+      // Purposely not implemented.
       Dijkstra( const Self& other );
       Self& operator=( const Self& other );
 
     protected:
-      typename TIntensityFunctor::Pointer m_IntensityFunctor;
-      typename TVertexFunctor::Pointer m_VertexFunctor;
-      unsigned long m_MSTIndex;
+      unsigned int m_MSTIdx;
     };
 
   } // ecapseman