...

[FrontAlgorithms.git] / lib / fpa / Base / MinimumSpanningTree.hxx

diff --git a/lib/fpa/Base/MinimumSpanningTree.hxx b/lib/fpa/Base/MinimumSpanningTree.hxx
index 4bf0135bf9ac3c17f04da5b35ced4cedb2b4980a..e8ed6a2c286e94b5701e022531a9e418a105cec1 100644 (file)
--- a/lib/fpa/Base/MinimumSpanningTree.hxx
+++ b/lib/fpa/Base/MinimumSpanningTree.hxx
@@ -114,7 +114,8 @@ GetPath( typename _TPath::Pointer& path, const _TVertex& a ) const
   } // elihw
   vertices.push_back( it );
 
-  path = _TPath::New( );
+  if( path.IsNull( ) )
+    path = _TPath::New( );
   for( auto v = vertices.begin( ); v != vertices.end( ); ++v )
     path->AddVertex( *v );
 }
@@ -126,97 +127,101 @@ GetPath(
   typename _TPath::Pointer& path, const _TVertex& a, const _TVertex& b
   ) const
 {
-/*
   static const unsigned long _inf =
     std::numeric_limits< unsigned long >::max( );
 
-  _TPath path;
-  _TPath pa = this->GetPath( a );
-  _TPath pb = this->GetPath( b );
-  if( pa.size( ) > 0 && pb.size( ) > 0 )
+  if( path.IsNull( ) )
+    path = _TPath::New( );
+  typename _TPath::Pointer pa, pb;
+  this->GetPath( pa, a );
+  this->GetPath( pb, b );
+  if( pa->GetSize( ) > 0 && pb->GetSize( ) > 0 )
   {
     // Find front identifiers
     unsigned long ia = _inf, ib = _inf;
     unsigned long N = this->m_Seeds.size( );
     for( unsigned long i = 0; i < N; ++i )
     {
-      if( this->m_Seeds[ i ] == pa.front( ) )
+      if( this->m_Seeds[ i ] == pa->GetVertex( pa->GetSize( ) - 1 ) )
         ia = i;
-      if( this->m_Seeds[ i ] == pb.front( ) )
+      if( this->m_Seeds[ i ] == pb->GetVertex( pb->GetSize( ) - 1 ) )
         ib = i;
 
     } // rof
 
+    // Check if there is a front-jump between given seeds
     if( ia != ib )
     {
-      // Use this->m_FrontPaths from Floyd-Warshall
-      if( this->m_FrontPaths[ ia ][ ib ] < _inf )
+      // Compute front path
+      std::vector< long > fpath;
+      fpath.push_back( ia );
+      while( ia != ib )
       {
-        // Compute front path
-        std::vector< long > fpath;
+        ia = this->m_FrontPaths[ ia ][ ib ];
         fpath.push_back( ia );
-        while( ia != ib )
-        {
-          ia = this->m_FrontPaths[ ia ][ ib ];
-          fpath.push_back( ia );
 
-        } // elihw
+      } // elihw
 
-        // Continue only if both fronts are connected
-        unsigned int N = fpath.size( );
-        if( N > 0 )
+      // Continue only if both fronts are connected
+      unsigned int N = fpath.size( );
+      if( N > 0 )
+      {
+        // First path: from start vertex to first collision
+        this->GetPath(
+          path, a,
+          this->m_Collisions[ fpath[ 0 ] ][ fpath[ 1 ] ].first
+          );
+
+        // Intermediary paths
+        for( unsigned int i = 1; i < N - 1; ++i )
         {
-          // First path: from start vertex to first collision
-          path = this->GetPath(
-            a, this->m_Collisions[ fpath[ 0 ] ][ fpath[ 1 ] ].first
+          typename _TPath::Pointer ipath;
+          this->GetPath(
+            ipath,
+            this->m_Collisions[ fpath[ i ] ][ fpath[ i - 1 ] ].first,
+            this->m_Collisions[ fpath[ i ] ][ fpath[ i + 1 ] ].first
             );
+          for( long id = 0; id < ipath->GetSize( ); ++id )
+            path->AddVertex( ipath->GetVertex( id ) );
 
-          // Intermediary paths
-          for( unsigned int i = 1; i < N - 1; ++i )
-          {
-            TVertices ipath =
-              this->GetPath(
-                this->m_Collisions[ fpath[ i ] ][ fpath[ i - 1 ] ].first,
-                this->m_Collisions[ fpath[ i ] ][ fpath[ i + 1 ] ].first
-                );
-            path.insert( path.end( ), ipath.begin( ), ipath.end( ) );
-
-          } // rof
-
-          // Final path: from last collision to end point
-          TVertices lpath =
-            this->GetPath(
-              this->m_Collisions[ fpath[ N - 1 ] ][ fpath[ N - 2 ] ].first, b
-              );
-          path.insert( path.end( ), lpath.begin( ), lpath.end( ) );
+        } // rof
 
-        } // fi
+        // Final path: from last collision to end point
+        typename _TPath::Pointer lpath;
+        this->GetPath(
+          lpath,
+          this->m_Collisions[ fpath[ N - 1 ] ][ fpath[ N - 2 ] ].first, b
+          );
+        for( long id = 0; id < lpath->GetSize( ); ++id )
+          path->AddVertex( lpath->GetVertex( id ) );
 
       } // fi
     }
     else
     {
       // Ignore common part: find common ancestor
-      auto aIt = pa.begin( );
-      auto bIt = pb.begin( );
-      while( *aIt == *bIt && aIt != pa.end( ) && bIt != pb.end( ) )
+      long aIt = pa->GetSize( ) - 1;
+      long bIt = pb->GetSize( ) - 1;
+      bool cont = true;
+      while( aIt >= 0 && bIt >= 0 && cont )
       {
-        ++aIt;
-        ++bIt;
+        cont = ( pa->GetVertex( aIt ) == pb->GetVertex( bIt ) );
+        aIt--;
+        bIt--;
 
       } // elihw
+      aIt++;
+      bIt++;
 
       // Glue both parts
-      for( --aIt; aIt != pa.end( ); ++aIt )
-        path.push_front( *aIt );
-      for( ; bIt != pb.end( ); ++bIt )
-        path.push_back( *bIt );
+      for( long cIt = 0; cIt <= aIt; ++cIt )
+        path->AddVertex( pa->GetVertex( cIt ) );
+      for( ; bIt >= 0; --bIt )
+        path->AddVertex( pb->GetVertex( bIt ) );
 
     } // fi
 
   } // fi
-  return( path );
-*/
 }
 
 // -------------------------------------------------------------------------