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

diff --git a/lib/fpa/Base/Dijkstra.hxx b/lib/fpa/Base/Dijkstra.hxx
index bad348b..93a102d 100644
--- a/lib/fpa/Base/Dijkstra.hxx
+++ b/lib/fpa/Base/Dijkstra.hxx
@@ -1,145 +1,74 @@
-#ifndef __FPA__BASE__DIJKSTRA__HXX__
-#define __FPA__BASE__DIJKSTRA__HXX__
+// =========================================================================
+// @author Leonardo Florez Valencia
+// @email florez-l@javeriana.edu.co
+// =========================================================================
 
-#include <algorithm>
+#ifndef __fpa__Base__Dijkstra__hxx__
+#define __fpa__Base__Dijkstra__hxx__
 
 // -------------------------------------------------------------------------
-template< class V, class C, class R, class S, class VC, class MST, class B >
-typename fpa::Base::Dijkstra< V, C, R, S, VC, MST, B >::
-TMinimumSpanningTree* fpa::Base::Dijkstra< V, C, R, S, VC, MST, B >::
+template< class _TAlgorithm, class _TMST >
+typename fpa::Base::Dijkstra< _TAlgorithm, _TMST >::
+TMST* fpa::Base::Dijkstra< _TAlgorithm, _TMST >::
 GetMinimumSpanningTree( )
 {
-  return(
-    dynamic_cast< TMinimumSpanningTree* >(
-      this->itk::ProcessObject::GetOutput( this->m_MSTIdx )
-      )
+  dynamic_cast< TMST* >(
+    this->itk::ProcessObject::GetOutput( this->m_MSTIdx )
     );
 }
 
 // -------------------------------------------------------------------------
-template< class V, class C, class R, class S, class VC, class MST, class B >
-const typename fpa::Base::Dijkstra< V, C, R, S, VC, MST, B >::
-TMinimumSpanningTree* fpa::Base::Dijkstra< V, C, R, S, VC, MST, B >::
+template< class _TAlgorithm, class _TMST >
+const typename fpa::Base::Dijkstra< _TAlgorithm, _TMST >::
+TMST* fpa::Base::Dijkstra< _TAlgorithm, _TMST >::
 GetMinimumSpanningTree( ) const
 {
-  return(
-    dynamic_cast< const TMinimumSpanningTree* >(
-      this->itk::ProcessObject::GetOutput( this->m_MSTIdx )
-      )
+  dynamic_cast< const TMST* >(
+    this->itk::ProcessObject::GetOutput( this->m_MSTIdx )
     );
 }
 
 // -------------------------------------------------------------------------
-template< class V, class C, class R, class S, class VC, class MST, class B >
-void fpa::Base::Dijkstra< V, C, R, S, VC, MST, B >::
-GraftMinimumSpanningTree( itk::DataObject* obj )
-{
-  TMinimumSpanningTree* mst = dynamic_cast< TMinimumSpanningTree* >( obj );
-  if( mst != NULL )
-    this->GraftNthOutput( this->m_MSTIdx, mst );
-}
-
-// -------------------------------------------------------------------------
-template< class V, class C, class R, class S, class VC, class MST, class B >
-fpa::Base::Dijkstra< V, C, R, S, VC, MST, B >::
+template< class _TAlgorithm, class _TMST >
+fpa::Base::Dijkstra< _TAlgorithm, _TMST >::
 Dijkstra( )
-  : Superclass( ),
-    m_LocalCosts( false ),
-    m_FillNodeQueue( false )
+  : Superclass( )
 {
   this->m_MSTIdx = this->GetNumberOfRequiredOutputs( );
-  this->SetNumberOfRequiredOutputs( this->m_MSTIdx + 1 );
-  this->itk::ProcessObject::SetNthOutput(
-    this->m_MSTIdx, TMinimumSpanningTree::New( )
-    );
+  this->itk::ProcessObject::SetNumberOfRequiredOutputs( this->m_MSTIdx + 1 );
+  this->SetNthOutput( this->m_MSTIdx, TMST::New( ) );
 }
 
 // -------------------------------------------------------------------------
-template< class V, class C, class R, class S, class VC, class MST, class B >
-fpa::Base::Dijkstra< V, C, R, S, VC, MST, B >::
+template< class _TAlgorithm, class _TMST >
+fpa::Base::Dijkstra< _TAlgorithm, _TMST >::
 ~Dijkstra( )
 {
 }
 
 // -------------------------------------------------------------------------
-template< class V, class C, class R, class S, class VC, class MST, class B >
-void fpa::Base::Dijkstra< V, C, R, S, VC, MST, B >::
-_BeforeGenerateData( )
+template< class _TAlgorithm, class _TMST >
+void fpa::Base::Dijkstra< _TAlgorithm, _TMST >::
+_AfterGenerateData( )
 {
-  this->Superclass::_BeforeGenerateData( );
-  this->GetMinimumSpanningTree( )->SetFillNodeQueue( this->m_FillNodeQueue );
-}
+  typedef typename Superclass::TSeedsInterface::TSeeds::iterator _TIt;
 
-// -------------------------------------------------------------------------
-template< class V, class C, class R, class S, class VC, class MST, class B >
-bool fpa::Base::Dijkstra< V, C, R, S, VC, MST, B >::
-_ComputeNeighborResult(
-  TResult& result, const TVertex& neighbor, const TVertex& parent
-  ) const
-{
-  result  = this->_Cost( neighbor, parent );
-  result *= TResult( this->_Distance( neighbor, parent ) );
-
-  // WARNING: Dijkstra does not work on negative values!
-  if( result >= TResult( 0 ) )
-  {
-    _TNode pn = this->_Node( parent );
-    if( pn.Label == Self::AliveLabel && !this->m_LocalCosts )
-      result += pn.Result;
-    return( true );
-  }
-  else
-    return( false );
-}
-
-// -------------------------------------------------------------------------
-template< class V, class C, class R, class S, class VC, class MST, class B >
-void fpa::Base::Dijkstra< V, C, R, S, VC, MST, B >::
-_SetResult( const TVertex& v, const _TNode& n )
-{
-  this->GetMinimumSpanningTree( )->SetNode( v, n.Parent, n.FrontId, n.Result );
-}
-
-// -------------------------------------------------------------------------
-template< class V, class C, class R, class S, class VC, class MST, class B >
-bool fpa::Base::Dijkstra< V, C, R, S, VC, MST, B >::
-_IsQueueEmpty( ) const
-{
-  return( this->m_Queue.empty( ) );
-}
-
-// -------------------------------------------------------------------------
-template< class V, class C, class R, class S, class VC, class MST, class B >
-void fpa::Base::Dijkstra< V, C, R, S, VC, MST, B >::
-_QueuePush( const TVertex& v, const _TNode& n )
-{
-  _TQueueNode qn;
-  qn.Vertex = v;
-  qn.Node = n;
-  this->m_Queue.push_back( qn );
-  std::push_heap( this->m_Queue.begin( ), this->m_Queue.end( ) );
-}
-
-// -------------------------------------------------------------------------
-template< class V, class C, class R, class S, class VC, class MST, class B >
-void fpa::Base::Dijkstra< V, C, R, S, VC, MST, B >::
-_QueuePop( TVertex& v, _TNode& n )
-{
-  _TQueueNode qn = this->m_Queue.front( );
-  std::pop_heap( this->m_Queue.begin( ), this->m_Queue.end( ) );
-  this->m_Queue.pop_back( );
-  v = qn.Vertex;
-  n = qn.Node;
+  TMST* mst = this->GetMinimumSpanningTree( );
+  mst->ClearSeeds( );
+  mst->SetCollisions( this->m_Collisions );
+  for( _TIt sIt = this->BeginSeeds( ); sIt != this->EndSeeds( ); ++sIt )
+    mst->AddSeed( sIt->Vertex );
 }
 
 // -------------------------------------------------------------------------
-template< class V, class C, class R, class S, class VC, class MST, class B >
-void fpa::Base::Dijkstra< V, C, R, S, VC, MST, B >::
-_QueueClear( )
+template< class _TAlgorithm, class _TMST >
+void fpa::Base::Dijkstra< _TAlgorithm, _TMST >::
+_UpdateOutputValue( const TNode& n )
 {
-  this->m_Queue.clear( );
+  this->Superclass::_UpdateOutputValue( n );
+  this->GetMinimumSpanningTree( )->SetParent( n.Vertex, n.Parent );
 }
 
-#endif // __FPA__BASE__DIJKSTRA__HXX__
+#endif // __fpa__Base__Dijkstra__hxx__
 
 // eof - $RCSfile$