X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2Ffpa%2FBase%2FDijkstra.h;h=5633f221f5b3bddedda29ab40575c6bcba12f397;hb=a993dd7dc7f3154d00eed3d3a4796fb9e3ff582d;hp=d4f27cdf7dce2c8065997323fb2f394a4c8adb64;hpb=56b8bb48cc05a297a3faa264f8f2a88de21ef203;p=FrontAlgorithms.git

diff --git a/lib/fpa/Base/Dijkstra.h b/lib/fpa/Base/Dijkstra.h
index d4f27cd..5633f22 100644
--- a/lib/fpa/Base/Dijkstra.h
+++ b/lib/fpa/Base/Dijkstra.h
@@ -1,10 +1,10 @@
-#ifndef __FPA__BASE__DIJKSTRA__H__
-#define __FPA__BASE__DIJKSTRA__H__
+#ifndef __fpa__Base__Dijkstra__h__
+#define __fpa__Base__Dijkstra__h__
 
 #include <vector>
+#include <fpa/Config.h>
 #include <itkFunctionBase.h>
-#include <fpa/Base/Algorithm.h>
-#include <fpa/Base/MinimumSpanningTree.h>
+#include <fpa/Base/DijkstraCostFunctionBase.h>
 
 namespace fpa
 {
@@ -12,7 +12,7 @@ namespace fpa
   {
     /**
      */
-    template< class _TSuperclass >
+    template< class _TSuperclass, class _TMST >
     class Dijkstra
       : public _TSuperclass
     {
@@ -22,70 +22,62 @@ namespace fpa
       typedef itk::SmartPointer< Self >       Pointer;
       typedef itk::SmartPointer< const Self > ConstPointer;
 
-      // 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 itk::FunctionBase< TScalar, TScalar > TCostConversionFunction;
-
-      typedef
-      fpa::Base::MinimumSpanningTree< TVertex, TScalar, TVertexCompare >
-      TMinimumSpanningTree;
-
-      struct TDijkstraCmp
+      typedef _TMST TMST;
+      typedef typename Superclass::TOutput TOutput;
+      typedef typename Superclass::TVertex TVertex;
+
+      typedef itk::FunctionBase< TOutput, TOutput > TCostConversionFunction;
+      typedef DijkstraCostFunctionBase< TVertex, TOutput > TCostFunction;
+
+    protected:
+      typedef typename Superclass::_TQueueNode _TQueueNode;
+      struct _TQueueNodeCompare
       {
-        bool operator()( const TNode& a, const TNode& b )
-          { return( b.Result < a.Result ); }
+        bool operator( )( const _TQueueNode& a, const _TQueueNode& b )
+          {
+            return( b.Result < a.Result );
+          }
       };
-      static const TDijkstraCmp DijkstraCmp;
+      typedef std::vector< _TQueueNode > _TQueue;
 
     public:
       itkTypeMacro( Dijkstra, Algorithm );
 
+      itkGetObjectMacro( CostFunction, TCostFunction );
       itkGetObjectMacro( CostConversionFunction, TCostConversionFunction );
+      itkSetObjectMacro( CostFunction, TCostFunction );
       itkSetObjectMacro( CostConversionFunction, TCostConversionFunction );
 
     public:
-      TMinimumSpanningTree* GetMinimumSpanningTree( );
-      const TMinimumSpanningTree* GetMinimumSpanningTree( ) const;
-      void GraftMinimumSpanningTree( itk::DataObject* obj );
+      _TMST* GetMinimumSpanningTree( );
+      const _TMST* GetMinimumSpanningTree( ) const;
 
     protected:
-      // Methods to extend itk-based architecture
       Dijkstra( );
       virtual ~Dijkstra( );
 
-      // Front propagation methods to be overloaded
       virtual void _AfterGenerateData( ) fpa_OVERRIDE;
-      virtual void _Visit( const TNode& n ) fpa_OVERRIDE;
-      virtual bool _Result( TNode& node, const TNode& parent ) fpa_OVERRIDE;
-      virtual void  _QueueClear( ) fpa_OVERRIDE;
-      virtual void  _QueuePush( const TNode& node ) fpa_OVERRIDE;
-      virtual TNode _QueuePop( ) fpa_OVERRIDE;
-      virtual bool  _IsQueueEmpty( ) const fpa_OVERRIDE;
 
-      // Dijkstra methods to be overloaded
-      virtual TScalar _Cost( const TVertex& a, const TVertex& b ) const = 0;
+      virtual void _UpdateResult( const _TQueueNode& n ) fpa_OVERRIDE;
+      virtual bool _UpdateValue(
+        _TQueueNode& v, const _TQueueNode& p
+        ) fpa_OVERRIDE;
+      virtual unsigned long _QueueSize( ) const fpa_OVERRIDE;
+      virtual void _QueueClear( ) fpa_OVERRIDE;
+      virtual void _QueuePush( const _TQueueNode& node ) fpa_OVERRIDE;
+      virtual _TQueueNode _QueuePop( ) fpa_OVERRIDE;
 
     private:
-      // Purposely not implemented
+      // Purposely not defined
       Dijkstra( const Self& other );
       Self& operator=( const Self& other );
 
     protected:
-      unsigned int m_MSTIdx;
-      std::vector< TNode > m_Queue;
+      _TQueue m_Queue;
+      typename TCostFunction::Pointer m_CostFunction;
       typename TCostConversionFunction::Pointer m_CostConversionFunction;
+
+      unsigned long m_MSTIndex;
     };
 
   } // ecapseman
@@ -94,8 +86,8 @@ namespace fpa
 
 #ifndef ITK_MANUAL_INSTANTIATION
 #  include <fpa/Base/Dijkstra.hxx>
-#endif
+#endif // ITK_MANUAL_INSTANTIATION
 
-#endif // __FPA__BASE__DIJKSTRA__H__
+#endif // __fpa__Base__Dijkstra__h__
 
 // eof - $RCSfile$