X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2Ffpa%2FImage%2FDijkstra.h;h=6882bfea2c245c2fb76031361ed0f62e4d66f81d;hb=fe01e92d9bce3519fa2a0936b6180ca7b057a87a;hp=96c642b273be7fce59a3d6f51bde113b3ed2f827;hpb=e9083d9f5f381f258f994fa9bbbe39a897f97c5b;p=FrontAlgorithms.git

diff --git a/lib/fpa/Image/Dijkstra.h b/lib/fpa/Image/Dijkstra.h
index 96c642b..6882bfe 100644
--- a/lib/fpa/Image/Dijkstra.h
+++ b/lib/fpa/Image/Dijkstra.h
@@ -1,10 +1,17 @@
+// =========================================================================
+// @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/MinimumSpanningTree.h>
-#include <fpa/Image/Functors/Base.h>
+#include <fpa/Image/Functors/Dijkstra/Identity.h>
 
 namespace fpa
 {
@@ -12,35 +19,78 @@ 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< _TInputImage, _TOutputImage, fpa::Base::MarksInterfaceWithCollisions< typename _TInputImage::IndexType >, fpa::Base::SeedsInterface< typename _TInputImage::IndexType, typename _TInputImage::PointType, typename _TInputImage::PixelType, typename _TOutputImage::PixelType, _TFrontId, typename _TInputImage::IndexType::LexicographicCompare > >, fpa::Image::MinimumSpanningTree< _TInputImage::ImageDimension > >
     {
     public:
-      typedef Dijkstra                                             Self;
-      typedef fpa::Image::Algorithm< _TInputImage, _TOutputImage > TAlgorithm;
-      typedef fpa::Image::MinimumSpanningTree< _TInputImage::ImageDimension > TMST;
+      typedef _TInputImage  TInputImage;
+      typedef _TOutputImage TOutputImage;
+      typedef _TFrontId     TFrontId;
+
+      typedef typename TInputImage::IndexType        TVertex;
+      typedef typename TInputImage::PointType        TPoint;
+      typedef typename TVertex::LexicographicCompare TVertexCompare;
+      typedef typename TInputImage::PixelType        TInputValue;
+      typedef typename TOutputImage::PixelType       TOutputValue;
+
+      typedef fpa::Base::MarksInterfaceWithCollisions< TVertex > TMarksInterface;
+      typedef fpa::Base::SeedsInterface< TVertex, TPoint, TInputValue, TOutputValue, TFrontId, TVertexCompare > TSeedsInterface;
+      typedef fpa::Image::Algorithm< TInputImage, TOutputImage, TMarksInterface, TSeedsInterface > TAlgorithm;
+      typedef fpa::Image::MinimumSpanningTree< TInputImage::ImageDimension > TMST;
+
+      typedef Dijkstra                                Self;
       typedef fpa::Base::Dijkstra< TAlgorithm, TMST > Superclass;
       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;
+      typedef fpa::Image::Functors::Dijkstra::Function< TInputImage, TOutputValue > TWeightFunction;
 
     public:
       itkNewMacro( Self );
       itkTypeMacro( fpa::Image::Dijkstra, fpa::Base::Dijkstra );
 
     protected:
-      Dijkstra( );
-      virtual ~Dijkstra( );
+      Dijkstra( )
+        : Superclass( )
+        {
+          typedef fpa::Image::Functors::Dijkstra::Identity< TInputImage, TOutputValue > _TDefaultFunction;
+          this->SetWeightFunction( _TDefaultFunction::New( ) );
+        }
+      virtual ~Dijkstra( )
+        {
+        }
 
-      virtual void _BeforeGenerateData( ) override;
+      virtual void _ConfigureOutput( const TOutputValue& v ) override
+        {
+          this->Superclass::_ConfigureOutput( v );
+          const TInputImage* in = this->GetInput( );
+
+          TMST* mst = this->GetMinimumSpanningTree( );
+          mst->SetLargestPossibleRegion( in->GetLargestPossibleRegion( ) );
+          mst->SetRequestedRegion( in->GetRequestedRegion( ) );
+          mst->SetBufferedRegion( in->GetBufferedRegion( ) );
+          mst->SetSpacing( in->GetSpacing( ) );
+          mst->SetOrigin( in->GetOrigin( ) );
+          mst->SetDirection( in->GetDirection( ) );
+          mst->Allocate( );
+
+          typename TMST::PixelType zero;
+          zero.Fill( 0 );
+          mst->FillBuffer( zero );
+        }
+
+      virtual void _BeforeGenerateData( ) override
+        {
+          this->Superclass::_BeforeGenerateData( );
+          TWeightFunction* wf =
+            dynamic_cast< TWeightFunction* >( this->GetWeightFunction( ) );
+          if( wf != NULL )
+            wf->SetImage( this->GetInput( ) );
+        }
 
     private:
-      // Purposely not defined
+      // Purposely not implemented.
       Dijkstra( const Self& other );
       Self& operator=( const Self& other );
     };
@@ -49,10 +99,6 @@ namespace fpa
 
 } // ecapseman
 
-#ifndef ITK_MANUAL_INSTANTIATION
-#  include <fpa/Image/Dijkstra.hxx>
-#endif // ITK_MANUAL_INSTANTIATION
-
 #endif // __fpa__Image__Dijkstra__h__
 
 // eof - $RCSfile$