X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2Ffpa%2FBase%2FDijkstra.hxx;h=93a102d2148729b8ca3aaf0af6a5fb99d1d3f17e;hb=e8b46a839b86641f48f593d021234566877ac683;hp=765b9a8beaf2c984511f17fc7b28812e3bb28278;hpb=d5fe8fd4bac61fafea412c358323ad90fe2b034b;p=FrontAlgorithms.git

diff --git a/lib/fpa/Base/Dijkstra.hxx b/lib/fpa/Base/Dijkstra.hxx
index 765b9a8..93a102d 100644
--- a/lib/fpa/Base/Dijkstra.hxx
+++ b/lib/fpa/Base/Dijkstra.hxx
@@ -7,179 +7,66 @@
 #define __fpa__Base__Dijkstra__hxx__
 
 // -------------------------------------------------------------------------
-template< class _TFilter, class _TMarksInterface, class _TSeedsInterface, class _TMST >
-typename
-fpa::Base::Dijkstra< _TFilter, _TMarksInterface, _TSeedsInterface, _TMST >::
-TMST* fpa::Base::Dijkstra< _TFilter, _TMarksInterface, _TSeedsInterface, _TMST >::
+template< class _TAlgorithm, class _TMST >
+typename fpa::Base::Dijkstra< _TAlgorithm, _TMST >::
+TMST* fpa::Base::Dijkstra< _TAlgorithm, _TMST >::
 GetMinimumSpanningTree( )
 {
-  return(
-    dynamic_cast< TMST* >(
-      this->itk::ProcessObject::GetOutput( this->m_MSTIndex )
-      )
+  dynamic_cast< TMST* >(
+    this->itk::ProcessObject::GetOutput( this->m_MSTIdx )
     );
 }
 
 // -------------------------------------------------------------------------
-template< class _TFilter, class _TMarksInterface, class _TSeedsInterface, class _TMST >
-const typename
-fpa::Base::Dijkstra< _TFilter, _TMarksInterface, _TSeedsInterface, _TMST >::
-TMST* fpa::Base::Dijkstra< _TFilter, _TMarksInterface, _TSeedsInterface, _TMST >::
+template< class _TAlgorithm, class _TMST >
+const typename fpa::Base::Dijkstra< _TAlgorithm, _TMST >::
+TMST* fpa::Base::Dijkstra< _TAlgorithm, _TMST >::
 GetMinimumSpanningTree( ) const
 {
-  return(
-    dynamic_cast< const TMST* >(
-      this->itk::ProcessObject::GetOutput( this->m_MSTIndex )
-      )
+  dynamic_cast< const TMST* >(
+    this->itk::ProcessObject::GetOutput( this->m_MSTIdx )
     );
 }
 
 // -------------------------------------------------------------------------
-template< class _TFilter, class _TMarksInterface, class _TSeedsInterface, class _TMST >
-const typename
-fpa::Base::Dijkstra< _TFilter, _TMarksInterface, _TSeedsInterface, _TMST >::
-TIntensityFunctor*
-fpa::Base::Dijkstra< _TFilter, _TMarksInterface, _TSeedsInterface, _TMST >::
-GetIntensityFunctor( ) const
-{
-  return( this->m_IntensityFunctor );
-}
-
-// -------------------------------------------------------------------------
-template< class _TFilter, class _TMarksInterface, class _TSeedsInterface, class _TMST >
-const typename
-fpa::Base::Dijkstra< _TFilter, _TMarksInterface, _TSeedsInterface, _TMST >::
-TVertexFunctor*
-fpa::Base::Dijkstra< _TFilter, _TMarksInterface, _TSeedsInterface, _TMST >::
-GetVertexFunctor( ) const
-{
-  return( this->m_VertexFunctor );
-}
-
-// -------------------------------------------------------------------------
-template< class _TFilter, class _TMarksInterface, class _TSeedsInterface, class _TMST >
-void fpa::Base::Dijkstra< _TFilter, _TMarksInterface, _TSeedsInterface, _TMST >::
-SetFunctor( TIntensityFunctor* functor )
-{
-  if( this->m_IntensityFunctor.GetPointer( ) != functor )
-  {
-    this->m_IntensityFunctor = functor;
-    this->Modified( );
-
-  } // fi
-}
-
-// -------------------------------------------------------------------------
-template< class _TFilter, class _TMarksInterface, class _TSeedsInterface, class _TMST >
-void fpa::Base::Dijkstra< _TFilter, _TMarksInterface, _TSeedsInterface, _TMST >::
-SetFunctor( TVertexFunctor* functor )
-{
-  if( this->m_VertexFunctor.GetPointer( ) != functor )
-  {
-    this->m_VertexFunctor = functor;
-    this->Modified( );
-
-  } // fi
-}
-
-// -------------------------------------------------------------------------
-template< class _TFilter, class _TMarksInterface, class _TSeedsInterface, class _TMST >
-fpa::Base::Dijkstra< _TFilter, _TMarksInterface, _TSeedsInterface, _TMST >::
+template< class _TAlgorithm, class _TMST >
+fpa::Base::Dijkstra< _TAlgorithm, _TMST >::
 Dijkstra( )
-  : Superclass( ),
-    _TMarksInterface( this ),
-    _TSeedsInterface( this )
+  : Superclass( )
 {
-  this->m_MSTIndex = this->GetNumberOfRequiredOutputs( );
-  this->SetNumberOfRequiredOutputs( this->m_MSTIndex + 1 );
-  this->itk::ProcessObject::SetNthOutput( this->m_MSTIndex, TMST::New( ) );
+  this->m_MSTIdx = this->GetNumberOfRequiredOutputs( );
+  this->itk::ProcessObject::SetNumberOfRequiredOutputs( this->m_MSTIdx + 1 );
+  this->SetNthOutput( this->m_MSTIdx, TMST::New( ) );
 }
 
 // -------------------------------------------------------------------------
-template< class _TFilter, class _TMarksInterface, class _TSeedsInterface, class _TMST >
-fpa::Base::Dijkstra< _TFilter, _TMarksInterface, _TSeedsInterface, _TMST >::
+template< class _TAlgorithm, class _TMST >
+fpa::Base::Dijkstra< _TAlgorithm, _TMST >::
 ~Dijkstra( )
 {
 }
 
 // -------------------------------------------------------------------------
-template< class _TFilter, class _TMarksInterface, class _TSeedsInterface, class _TMST >
-void fpa::Base::Dijkstra< _TFilter, _TMarksInterface, _TSeedsInterface, _TMST >::
-GenerateData( )
+template< class _TAlgorithm, class _TMST >
+void fpa::Base::Dijkstra< _TAlgorithm, _TMST >::
+_AfterGenerateData( )
 {
-  // Init objects
-  this->_ConfigureOutputs( TOutputValue( 0 ) );
-  this->_InitMarks( this->GetNumberOfSeeds( ) );
-  TMST* mst = this->GetMinimumSpanningTree( );
-
-  // Init queue
-  std::vector< _TNode > q;
-  unsigned long frontId = 1;
-  typename TSeedsInterface::TSeeds::const_iterator sIt = this->BeginSeeds( );
-  for( ; sIt != this->EndSeeds( ); ++sIt )
-    q.push_back( _TNode( *sIt, *sIt, frontId++ ) );
-
-  // Main loop
-  while( q.size( ) > 0 )
-  {
-    // Get next candidate
-    std::pop_heap( q.begin( ), q.end( ) );
-    _TNode node = q.back( );
-    q.pop_back( );
-    if( this->_IsMarked( node.Vertex ) )
-      continue;
-    this->_Mark( node.Vertex, node.FrontId );
-
-    // Ok, pixel lays inside region
-    this->_SetOutputValue( node.Vertex, node.Cost );
-    mst->SetParent( node.Vertex, node.Parent );
-
-    // Add neighborhood
-    TVertices neighbors = this->_GetNeighbors( node.Vertex );
-    for( TVertex neigh: neighbors )
-    {
-      if( this->_IsMarked( neigh ) )
-      {
-        // Invoke stop at collisions
-        unsigned long nColl = this->_Collisions( node.Vertex, neigh );
-        if(
-          this->StopAtOneFront( ) &&
-          this->GetNumberOfSeeds( ) > 1 &&
-          nColl == 1
-          )
-          q.clear( );
-      }
-      else
-      {
-        // Compute new cost
-        TOutputValue ncost =
-          this->m_VertexFunctor->Evaluate( neigh, node.Vertex );
-        if( this->m_IntensityFunctor.IsNotNull( ) )
-          ncost = this->m_IntensityFunctor->Evaluate( ncost );
-
-        // This algorithm only supports positive values
-        if( ncost >= TOutputValue( 0 ) )
-        {
-          // Insert new node
-          _TNode nn( neigh, node.Vertex, node.FrontId );
-          nn.Cost = node.Cost + ncost;
-          q.push_back( nn );
-          std::push_heap( q.begin( ), q.end( ) );
-
-        } // fi
+  typedef typename Superclass::TSeedsInterface::TSeeds::iterator _TIt;
 
-      } // fi
-
-    } // rof
-
-  } // elihw
-  this->_FreeMarks( );
-
-  // Complete data into minimum spanning tree
+  TMST* mst = this->GetMinimumSpanningTree( );
   mst->ClearSeeds( );
   mst->SetCollisions( this->m_Collisions );
-  for( TVertex seed: this->GetSeeds( ) )
-    mst->AddSeed( seed );
+  for( _TIt sIt = this->BeginSeeds( ); sIt != this->EndSeeds( ); ++sIt )
+    mst->AddSeed( sIt->Vertex );
+}
+
+// -------------------------------------------------------------------------
+template< class _TAlgorithm, class _TMST >
+void fpa::Base::Dijkstra< _TAlgorithm, _TMST >::
+_UpdateOutputValue( const TNode& n )
+{
+  this->Superclass::_UpdateOutputValue( n );
+  this->GetMinimumSpanningTree( )->SetParent( n.Vertex, n.Parent );
 }
 
 #endif // __fpa__Base__Dijkstra__hxx__