...

[FrontAlgorithms.git] / lib / fpa / Filters / Dijkstra.hxx

diff --git a/lib/fpa/Filters/Dijkstra.hxx b/lib/fpa/Filters/Dijkstra.hxx
index a27669a5c3bd8ff16ed22be69e72d33ca45471db..e065e74850a1f558229ce7d1f39fb8247b6d61fd 100644 (file)
--- a/lib/fpa/Filters/Dijkstra.hxx
+++ b/lib/fpa/Filters/Dijkstra.hxx
@@ -6,24 +6,23 @@
 #define __fpa__Filters__Dijkstra__hxx__
 
 // -------------------------------------------------------------------------
-template< class _TTraits, class _TMST >
-fpa::Filters::Dijkstra< _TTraits, _TMST >::
+template< class _TDataInterface, class _TMST >
+fpa::Filters::Dijkstra< _TDataInterface, _TMST >::
 Dijkstra( )
-  : Superclass( )
 {
   fpaFilterOutputConfigureMacro( MinimumSpanningTree, TMST );
 }
 
 // -------------------------------------------------------------------------
-template< class _TTraits, class _TMST >
-fpa::Filters::Dijkstra< _TTraits, _TMST >::
+template< class _TDataInterface, class _TMST >
+fpa::Filters::Dijkstra< _TDataInterface, _TMST >::
 ~Dijkstra( )
 {
 }
 
 // -------------------------------------------------------------------------
-template< class _TTraits, class _TMST >
-void fpa::Filters::Dijkstra< _TTraits, _TMST >::
+template< class _TDataInterface, class _TMST >
+void fpa::Filters::Dijkstra< _TDataInterface, _TMST >::
 _AfterGenerateData( )
 {
   this->Superclass::_AfterGenerateData( );
@@ -31,16 +30,16 @@ _AfterGenerateData( )
   TMST* mst = this->GetMinimumSpanningTree( );
   mst->ClearSeeds( );
   mst->SetCollisions( this->m_Collisions );
-  for( TNode n: this->GetSeeds( ) )
-    mst->AddSeed( n.Vertex );
+  for( TNode seed: this->GetSeeds( ) )
+    mst->AddSeed( seed.Vertex, seed.FrontId );
 }
 
 // -------------------------------------------------------------------------
-template< class _TTraits, class _TMST >
-void fpa::Filters::Dijkstra< _TTraits, _TMST >::
-_UpdateOutputValue( TNode& n )
+template< class _TDataInterface, class _TMST >
+void fpa::Filters::Dijkstra< _TDataInterface, _TMST >::
+_PostComputeOutputValue( TNode& n )
 {
-  this->Superclass::_UpdateOutputValue( n );
+  this->Superclass::_PostComputeOutputValue( n );
   this->GetMinimumSpanningTree( )->SetParent( n.Vertex, n.Parent );
 }