From: Leonardo Flórez-Valencia <leonardo.florez@gmail.com>
Date: Wed, 21 Jun 2017 02:31:45 +0000 (-0500)
Subject: ...
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=c4efafee513539e9a58c4a8b8369450ada1df5d8;p=FrontAlgorithms.git

...
---

diff --git a/lib/fpa/Base/Dijkstra.hxx b/lib/fpa/Base/Dijkstra.hxx
index e858eb3..40058e1 100644
--- a/lib/fpa/Base/Dijkstra.hxx
+++ b/lib/fpa/Base/Dijkstra.hxx
@@ -53,13 +53,13 @@ _AfterGenerateData( )
 {
   typedef typename Superclass::TSeedsInterface::TSeeds::iterator _TIt;
 
+  this->Superclass::_AfterGenerateData( );
+
   TMST* mst = this->GetMinimumSpanningTree( );
   mst->ClearSeeds( );
   mst->SetCollisions( this->m_Collisions );
   for( _TIt sIt = this->BeginSeeds( ); sIt != this->EndSeeds( ); ++sIt )
     mst->AddSeed( sIt->Vertex );
-
-  this->Superclass::_AfterGenerateData( );
 }
 
 // -------------------------------------------------------------------------
diff --git a/lib/fpa/Base/MinimumSpanningTree.hxx b/lib/fpa/Base/MinimumSpanningTree.hxx
index c5838f3..6004aaa 100644
--- a/lib/fpa/Base/MinimumSpanningTree.hxx
+++ b/lib/fpa/Base/MinimumSpanningTree.hxx
@@ -163,7 +163,7 @@ GetPath( const _TVertex& a, const _TVertex& b ) const
       {
         // First path: from start vertex to first collision
         vertices = this->GetPath(
-          a, this->m_Collisions[ fpath[ 0 ] ][ fpath[ 1 ] ].first
+          a, this->m_Collisions[ fpath[ 1 ] ][ fpath[ 0 ] ].first
           );
 
         // Intermediary paths
@@ -182,7 +182,7 @@ GetPath( const _TVertex& a, const _TVertex& b ) const
         // Final path: from last collision to end point
         TVertices lpath =
           this->GetPath(
-            this->m_Collisions[ fpath[ N - 1 ] ][ fpath[ N - 2 ] ].first, b
+            this->m_Collisions[ fpath[ N - 2 ] ][ fpath[ N - 1 ] ].first, b
             );
         for( long id = 0; id < lpath.size( ); ++id )
           vertices.push_back( lpath[ id ] );