Some bugs...

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

diff --git a/lib/fpa/Image/DijkstraWithSphereBacktracking.h b/lib/fpa/Image/DijkstraWithSphereBacktracking.h
index febfcc9f134d7e82eea42dbf2dabd92c01c819b5..137017a50a2adb5bbf5090217f6083f967347f5d 100644 (file)
--- a/lib/fpa/Image/DijkstraWithSphereBacktracking.h
+++ b/lib/fpa/Image/DijkstraWithSphereBacktracking.h
@@ -28,12 +28,12 @@ namespace fpa
       typedef typename Superclass::InputImageType TImage;
       typedef std::deque< TVertex >               TVertices;
 
-      typedef typename Superclass::TTraits::TVertexCmp TVertexCmp;
-      typedef std::map< TVertex, TVertex, TVertexCmp > TTree;
-
       typedef unsigned short                         TMark;
       typedef itk::Image< TMark, I::ImageDimension > TMarkImage;
 
+      typedef typename Superclass::TTraits::TVertexCmp   TVertexCmp;
+      typedef std::pair< TVertex, TMark >                TTreeNode;
+      typedef std::map< TVertex, TTreeNode, TVertexCmp > TTree;
 
       typedef typename Superclass::TEndEvent             TEndEvent;
       typedef typename Superclass::TBacktrackingEvent    TBacktrackingEvent;
@@ -52,7 +52,8 @@ namespace fpa
       itkNewMacro( Self );
       itkTypeMacro( DijkstraWithSphereBacktracking, Dijkstra );
 
-      itkGetConstMacro( FinalTree, TTree );
+      itkGetConstMacro( FullTree, TTree );
+      itkGetConstMacro( ReducedTree, TTree );
       itkGetConstMacro( EndPoints, TVertices );
       itkGetConstMacro( BifurcationPoints, TVertices );
       itkGetConstMacro( NumberOfBranches, TMark );
@@ -78,7 +79,8 @@ namespace fpa
 
     protected:
       _TCandidates m_Candidates;
-      TTree        m_FinalTree;
+      TTree        m_FullTree;
+      TTree        m_ReducedTree;
       TVertices    m_BifurcationPoints;
       TVertices    m_EndPoints;
       TMark        m_NumberOfBranches;