Mori is alivegit status!

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

diff --git a/lib/fpa/Base/RegionGrow.hxx b/lib/fpa/Base/RegionGrow.hxx
index 8542f3028f3c857d2bce88e225d9331f8210ceca..e7dba1fa3fbb6a7453846a2e00507352d5dec9d9 100644 (file)
--- a/lib/fpa/Base/RegionGrow.hxx
+++ b/lib/fpa/Base/RegionGrow.hxx
@@ -1,89 +1,84 @@
-#ifndef __FPA__BASE__REGIONGROWING__HXX__
-#define __FPA__BASE__REGIONGROWING__HXX__
+#ifndef __fpa__Base__RegionGrow__hxx__
+#define __fpa__Base__RegionGrow__hxx__
+
+#include <fpa/Base/Functors/RegionGrow/Tautology.h>
 
 // -------------------------------------------------------------------------
-template< class V, class C, class R, class S, class VC, class B >
-fpa::Base::RegionGrow< V, C, R, S, VC, B >::
+template< class _TSuperclass >
+fpa::Base::RegionGrow< _TSuperclass >::
 RegionGrow( )
   : Superclass( ),
-    m_InsideValue( TResult( 1 ) ),
-    m_OutsideValue( TResult( 0 ) )
+    m_InsideValue( TOutput( 1 ) ),
+    m_OutsideValue( TOutput( 0 ) )
 {
+  this->m_InitResult = TOutput( 0 );
+  this->SetGrowFunction(
+    fpa::Base::Functors::RegionGrow::Tautology< TVertex >::New( )
+    );
 }
 
 // -------------------------------------------------------------------------
-template< class V, class C, class R, class S, class VC, class B >
-fpa::Base::RegionGrow< V, C, R, S, VC, B >::
+template< class _TSuperclass >
+fpa::Base::RegionGrow< _TSuperclass >::
 ~RegionGrow( )
 {
 }
 
 // -------------------------------------------------------------------------
-template< class V, class C, class R, class S, class VC, class B >
-bool fpa::Base::RegionGrow< V, C, R, S, VC, B >::
-_CheckMembership( const TVertex& v ) const
+template< class _TSuperclass >
+bool fpa::Base::RegionGrow< _TSuperclass >::
+_UpdateValue( _TQueueNode& v, const _TQueueNode& p )
 {
-  if( this->m_GrowingFunction.IsNotNull( ) )
-    return( this->m_GrowingFunction->Evaluate( v ) );
-  else
-    return( true );
-}
-
-// -------------------------------------------------------------------------
-template< class V, class C, class R, class S, class VC, class B >
-bool fpa::Base::RegionGrow< V, C, R, S, VC, B >::
-_ComputeNeighborResult(
-  TResult& result, const TVertex& neighbor, const TVertex& parent
-  ) const
-{
-  if( this->_CheckMembership( neighbor ) )
+  if( this->m_GrowFunction.IsNotNull( ) )
   {
-    result = this->m_InsideValue;
-    return( true );
+    bool in = this->m_GrowFunction->Evaluate( p.Vertex, v.Vertex );
+    v.Result = ( in )? this->m_InsideValue: this->m_OutsideValue;
+    return( in );
   }
   else
   {
-    result = this->m_OutsideValue;
+    v.Result = this->m_InitResult;
     return( false );
 
   } // fi
 }
 
 // -------------------------------------------------------------------------
-template< class V, class C, class R, class S, class VC, class B >
-bool fpa::Base::RegionGrow< V, C, R, S, VC, B >::
-_IsQueueEmpty( ) const
+template< class _TSuperclass >
+unsigned long fpa::Base::RegionGrow< _TSuperclass >::
+_QueueSize( ) const
 {
-  return( this->m_Queue.empty( ) );
+  return( this->m_Queue.size( ) );
 }
 
 // -------------------------------------------------------------------------
-template< class V, class C, class R, class S, class VC, class B >
-void fpa::Base::RegionGrow< V, C, R, S, VC, B >::
-_QueuePush( const TVertex& v, const _TNode& n )
+template< class _TSuperclass >
+void fpa::Base::RegionGrow< _TSuperclass >::
+_QueueClear( )
 {
-  this->m_Queue.push( std::pair< TVertex, _TNode >( v, n ) );
+  while( this->m_Queue.size( ) > 0 )
+    this->m_Queue.pop( );
 }
 
 // -------------------------------------------------------------------------
-template< class V, class C, class R, class S, class VC, class B >
-void fpa::Base::RegionGrow< V, C, R, S, VC, B >::
-_QueuePop( TVertex& v, _TNode& n )
+template< class _TSuperclass >
+void fpa::Base::RegionGrow< _TSuperclass >::
+_QueuePush( const _TQueueNode& node )
 {
-  v = this->m_Queue.front( ).first;
-  n = this->m_Queue.front( ).second;
-  this->m_Queue.pop( );
+  this->m_Queue.push( node );
 }
 
 // -------------------------------------------------------------------------
-template< class V, class C, class R, class S, class VC, class B >
-void fpa::Base::RegionGrow< V, C, R, S, VC, B >::
-_QueueClear( )
+template< class _TSuperclass >
+typename fpa::Base::RegionGrow< _TSuperclass >::
+_TQueueNode fpa::Base::RegionGrow< _TSuperclass >::
+_QueuePop( )
 {
-  while( this->m_Queue.size( ) > 0 )
-    this->m_Queue.pop( );
+  _TQueueNode f = this->m_Queue.front( );
+  this->m_Queue.pop( );
+  return( f );
 }
 
-#endif // __FPA__BASE__REGIONGROWING__HXX__
+#endif // __fpa__Base__RegionGrow__hxx__
 
 // eof - $RCSfile$