...

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

diff --git a/lib/fpa/Base/Dijkstra.h b/lib/fpa/Base/Dijkstra.h
index 3831526a553e5a85bd4c9ccd77d9367e0a735b07..08c704e83b9b7d019eafd6904be1b68158d8e771 100644 (file)
--- a/lib/fpa/Base/Dijkstra.h
+++ b/lib/fpa/Base/Dijkstra.h
@@ -1,89 +1,66 @@
-#ifndef __FPA__BASE__DIJKSTRA__H__
-#define __FPA__BASE__DIJKSTRA__H__
+#ifndef __fpa__Base__Dijkstra__h__
+#define __fpa__Base__Dijkstra__h__
 
-#include <vector>
-#include <fpa/Base/Algorithm.h>
+#include <fpa/Base/PriorityQueueAlgorithm.h>
 
 namespace fpa
 {
   namespace Base
   {
     /**
-     * Dijkstra is a front propagation algorithm that minimizes costs
-     *
-     * @param V Vertex type.
-     * @param C Vertex value type.
-     * @param R Result value type.
-     * @param B Base class for this algorithm. It should be any itk-based
-     *          filter (itk::ProcessObject).
-     *
      */
-    template< class V, class C, class R, class B >
+    template< class _TSuperclass, class _TMST >
     class Dijkstra
-      : public Algorithm< V, C, R, B >
+      : public fpa::Base::PriorityQueueAlgorithm< _TSuperclass >
     {
     public:
-      typedef Dijkstra                         Self;
-      typedef Algorithm< V, C, R, B >          Superclass;
-      typedef itk::SmartPointer< Self >        Pointer;
-      typedef itk::SmartPointer< const Self >  ConstPointer;
+      typedef Dijkstra                                          Self;
+      typedef fpa::Base::PriorityQueueAlgorithm< _TSuperclass > Superclass;
+      typedef itk::SmartPointer< Self >                         Pointer;
+      typedef itk::SmartPointer< const Self >                   ConstPointer;
 
+      typedef _TMST TMST;
+      typedef typename Superclass::TOutput TOutput;
       typedef typename Superclass::TVertex TVertex;
-      typedef typename Superclass::TValue  TValue;
-      typedef typename Superclass::TResult TResult;
 
     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;
-
-      typedef std::vector< _TNode > _TQueue;
-      struct _TNodeCompare
-      {
-        // Make the min-heap behave as a max-heap
-        bool operator()( const _TNode& a, const _TNode& b ) const
-          { return( b.Result < a.Result ); }
-      };
+      typedef typename Superclass::_TQueueNode _TQueueNode;
 
     public:
       itkTypeMacro( Dijkstra, Algorithm );
 
+    public:
+      _TMST* GetMinimumSpanningTree( );
+      const _TMST* GetMinimumSpanningTree( ) const;
+
     protected:
       Dijkstra( );
       virtual ~Dijkstra( );
 
-      virtual TResult _Cost( const TVertex& v, const TVertex& p ) const = 0;
-
-      // Results-related abstract methods
-      virtual bool _ComputeNeighborResult(
-        TResult& result, const TVertex& neighbor, const TVertex& parent
-        ) const;
+      virtual void _AfterGenerateData( ) override;
 
-      // Queue-related abstract methods
-      virtual bool _IsQueueEmpty( ) const;
-      virtual void _QueuePush( const _TNode& n );
-      virtual _TNode _QueuePop( );
-      virtual void _QueueClear( );
+      virtual void _UpdateResult( const _TQueueNode& n ) override;
+      virtual bool _UpdateValue(
+        _TQueueNode& v, const _TQueueNode& p
+        ) override;
 
     private:
-      // Purposely not implemented
+      // Purposely not defined
       Dijkstra( const Self& other );
       Self& operator=( const Self& other );
 
     protected:
-      _TQueue m_Queue;
-      static _TNodeCompare m_NodeCompare;
+      unsigned long m_MSTIndex;
     };
 
   } // ecapseman
 
 } // ecapseman
 
-#include <fpa/Base/Dijkstra.hxx>
+#ifndef ITK_MANUAL_INSTANTIATION
+#  include <fpa/Base/Dijkstra.hxx>
+#endif // ITK_MANUAL_INSTANTIATION
 
-#endif // __FPA__BASE__DIJKSTRA__H__
+#endif // __fpa__Base__Dijkstra__h__
 
 // eof - $RCSfile$