...

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

diff --git a/lib/fpa/Image/Dijkstra.h b/lib/fpa/Image/Dijkstra.h
index d5a1bb9e6f2026b9038dcbda532aaea24dbbe9c7..d755ebfa8698bc1f1bf01a51403489d87da677a3 100644 (file)
--- a/lib/fpa/Image/Dijkstra.h
+++ b/lib/fpa/Image/Dijkstra.h
@@ -7,11 +7,9 @@
 #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/DefaultTraits.h>
 #include <fpa/Image/MinimumSpanningTree.h>
-#include <fpa/Image/Functors/Dijkstra/Identity.h>
 
 namespace fpa
 {
@@ -21,72 +19,28 @@ namespace fpa
      */
     template< class _TInputImage, class _TOutputImage, class _TFrontId = unsigned char >
     class Dijkstra
-      : public fpa::Base::Dijkstra< fpa::Image::Algorithm< _TInputImage, _TOutputImage, fpa::Base::MarksInterfaceWithCollisions< typename _TInputImage::IndexType >, fpa::Base::SeedsInterface< typename _TInputImage::IndexType, typename _TInputImage::PixelType, typename _TOutputImage::PixelType, _TFrontId, typename _TInputImage::IndexType::LexicographicCompare > >, 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 _TInputImage  TInputImage;
       typedef _TOutputImage TOutputImage;
       typedef _TFrontId     TFrontId;
+      typedef fpa::Image::MinimumSpanningTree< _TInputImage::ImageDimension > TMST;
 
-      typedef typename TInputImage::IndexType        TVertex;
-      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, 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::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 fpa::Image::Functors::Dijkstra::Function< TInputImage, TOutputValue > TWeightFunction;
-
     public:
       itkNewMacro( Self );
       itkTypeMacro( fpa::Image::Dijkstra, fpa::Base::Dijkstra );
 
     protected:
-      Dijkstra( )
-        : Superclass( )
-        {
-          typedef fpa::Image::Functors::Dijkstra::Identity< TInputImage, TOutputValue > _TDefaultFunction;
-          this->SetWeightFunction( _TDefaultFunction::New( ) );
-        }
-      virtual ~Dijkstra( )
-        {
-        }
-
-      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( ) );
-        }
+      Dijkstra( ) : Superclass( ) { }
+      virtual ~Dijkstra( )        { }
 
     private:
       // Purposely not implemented.