...

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

diff --git a/lib/fpa/Image/RandomWalker.h b/lib/fpa/Image/RandomWalker.h
index 5438f007b992133bc021ebd451fd015568ff0d0c..213eb976b38c28f22da5d3e9d7e272d842215d33 100644 (file)
--- a/lib/fpa/Image/RandomWalker.h
+++ b/lib/fpa/Image/RandomWalker.h
@@ -7,10 +7,10 @@
 #define __fpa__Image__RandomWalker__h__
 
 #include <itkImage.h>
-
 #include <fpa/Base/DijkstraBase.h>
 #include <fpa/Base/MarksInterface.h>
 #include <fpa/Image/Algorithm.h>
+#include <fpa/Image/DefaultTraits.h>
 #include <fpa/Image/LabelledSeedsInterface.h>
 #include <fpa/Image/Functors/Dijkstra/Function.h>
 
@@ -20,33 +20,27 @@ namespace fpa
   {
     /**
      */
-    template< class _TInputImage, class _TLabelImage, class _TScalar >
+    template< class _TInputImage, class _TLabelImage, class _TScalar, class _TTraits = fpa::Image::DefaultTraits< _TInputImage, itk::Image< _TScalar, _TInputImage::ImageDimension >, typename _TLabelImage::PixelType > >
     class RandomWalker
-      : public fpa::Base::DijkstraBase< fpa::Image::Algorithm< _TInputImage, itk::Image< _TScalar, _TInputImage::ImageDimension >, fpa::Base::MarksInterface< typename _TInputImage::IndexType >, fpa::Image::LabelledSeedsInterface< typename _TInputImage::IndexType, typename _TInputImage::PointType, typename _TInputImage::PixelType, _TScalar, typename _TLabelImage::PixelType, typename _TInputImage::IndexType::LexicographicCompare > > >
+      : public fpa::Base::DijkstraBase< fpa::Image::Algorithm< _TTraits, fpa::Base::MarksInterface< _TTraits >, fpa::Image::LabelledSeedsInterface< _TTraits > > >
     {
     public:
       typedef _TInputImage TInputImage;
       typedef _TLabelImage TLabelImage;
       typedef _TScalar     TScalar;
-      typedef typename TInputImage::IndexType        TVertex;
-      typedef typename TInputImage::PointType        TPoint;
-      typedef typename TVertex::LexicographicCompare TVertexCompare;
-      typedef typename TInputImage::PixelType        TInputValue;
-      typedef typename TLabelImage::PixelType        TFrontId;
+      typedef _TTraits     TTraits;
+      fpa_Base_TraitTypes( typename TTraits );
 
-      typedef itk::Image< TScalar, _TInputImage::ImageDimension > TOutputImage;
-      typedef fpa::Base::MarksInterface< TVertex > TMarksInterface;
-      typedef fpa::Image::LabelledSeedsInterface< TVertex, TPoint, TInputValue, _TScalar, TFrontId, TVertexCompare > TSeedsInterface;
-      typedef fpa::Image::Algorithm< _TInputImage, TOutputImage, TMarksInterface, TSeedsInterface > TAlgorithm;
+      typedef fpa::Base::MarksInterface< TTraits > TMarksInterface;
+      typedef fpa::Image::LabelledSeedsInterface< TTraits > TSeedsInterface;
+      typedef fpa::Image::Algorithm< TTraits, TMarksInterface, TSeedsInterface > TAlgorithm;
 
-      typedef RandomWalker                          Self;
       typedef fpa::Base::DijkstraBase< TAlgorithm > Superclass;
+      typedef RandomWalker                          Self;
       typedef itk::SmartPointer< Self >             Pointer;
       typedef itk::SmartPointer< const Self >       ConstPointer;
-
+      
       typedef fpa::Image::Functors::Dijkstra::Function< TInputImage, TScalar > TWeightFunction;
-      typedef typename TSeedsInterface::TNode  TNode;
-      typedef typename TSeedsInterface::TNodes TNodes;
 
     public:
       itkNewMacro( Self );