Gaussian estimation region grow updated

diff --git a/appli/examples/example_Image_RegionGrow_GaussianModelEstimation.cxx b/appli/examples/example_Image_RegionGrow_GaussianModelEstimation.cxx
index 2d278783ecbfe66bb98c7cf91d24e0f3348d3e96..914e3fa45d077cc6ce25e0bd685fd349e57bf530 100644 (file)
--- a/appli/examples/example_Image_RegionGrow_GaussianModelEstimation.cxx
+++ b/appli/examples/example_Image_RegionGrow_GaussianModelEstimation.cxx
@@ -41,7 +41,7 @@ int main( int argc, char* argv[] )
   {
     std::cerr
       << "Usage: " << argv[ 0 ]
-      << " input_image neighborhood_order support"
+      << " input_image neighborhood_order support [model_file]"
       << std::endl;
     return( 1 );
 
@@ -123,7 +123,9 @@ int main( int argc, char* argv[] )
   typedef fpa::Image::Functors::GaussianModelEstimatorFunction< TColorImage, TScalar > TFunction;
   TFunction::Pointer function = TFunction::New( );
   function->SetModelSupport( support );
-
+  if( argc > 4 )
+    function->LoadModelFromFile( argv[ 4 ] );
+  
   // Prepare region grow filter
   typedef fpa::Image::RegionGrow< TColorImage, TImage > TFilter;
   TFilter::Pointer filter = TFilter::New( );

diff --git a/lib/fpa/Image/Functors/GaussianModelEstimatorFunction.h b/lib/fpa/Image/Functors/GaussianModelEstimatorFunction.h
index 10178033fe397f77f8967ba5be99ddc96566446d..e3cabfe34387b3e2ee27b712de786e00b00694a1 100644 (file)
--- a/lib/fpa/Image/Functors/GaussianModelEstimatorFunction.h
+++ b/lib/fpa/Image/Functors/GaussianModelEstimatorFunction.h
@@ -33,9 +33,12 @@ namespace fpa
         itkTypeMacro( GaussianModelEstimatorFunction, itkFunctionBase );
 
         itkGetConstMacro( ModelSupport, unsigned long );
-        itkSetMacro( ModelSupport, unsigned long );
 
       public:
+        bool SaveModelToFile( const std::string& filename ) const;
+        bool LoadModelFromFile( const std::string& filename );
+
+        virtual void SetModelSupport( const unsigned long& s );
         virtual bool Evaluate( const typename I::PixelType& rgb ) const;
 
       protected:
@@ -52,6 +55,7 @@ namespace fpa
         TYPbPrFunction m_YPbPrFunction;
 
         unsigned long m_ModelSupport;
+        unsigned long m_RealModelSupport;
         mutable bool m_Estimating;
       };
 

diff --git a/lib/fpa/Image/Functors/GaussianModelEstimatorFunction.hxx b/lib/fpa/Image/Functors/GaussianModelEstimatorFunction.hxx
index c9adb715e337ee25a284a5764e3d3a149e822dc4..accfb27825bf66fb6a34918c325499aa149ceb24 100644 (file)
--- a/lib/fpa/Image/Functors/GaussianModelEstimatorFunction.hxx
+++ b/lib/fpa/Image/Functors/GaussianModelEstimatorFunction.hxx
@@ -1,26 +1,52 @@
 #ifndef __FPA__IMAGE__FUNCTORS__GAUSSIANMODELESTIMATORFUNCTION__HXX__
 #define __FPA__IMAGE__FUNCTORS__GAUSSIANMODELESTIMATORFUNCTION__HXX__
 
+// -------------------------------------------------------------------------
+template< class I, class S >
+bool fpa::Image::Functors::GaussianModelEstimatorFunction< I, S >::
+SaveModelToFile( const std::string& filename ) const
+{
+  this->m_Estimator->SaveModelToFile( filename );
+}
+
+// -------------------------------------------------------------------------
+template< class I, class S >
+bool fpa::Image::Functors::GaussianModelEstimatorFunction< I, S >::
+LoadModelFromFile( const std::string& filename )
+{
+  this->m_Estimator->LoadModelFromFile( filename );
+  this->m_RealModelSupport =
+    this->m_ModelSupport + this->m_Estimator->GetNumberOfSamples( );
+  this->m_Estimating = false;
+  this->Modified( );
+}
+
+// -------------------------------------------------------------------------
+template< class I, class S >
+void fpa::Image::Functors::GaussianModelEstimatorFunction< I, S >::
+SetModelSupport( const unsigned long& s )
+{
+  this->m_ModelSupport = s;
+  this->m_RealModelSupport = s;
+  this->Modified( );
+}
+
 // -------------------------------------------------------------------------
 template< class I, class S >
 bool fpa::Image::Functors::GaussianModelEstimatorFunction< I, S >::
 Evaluate( const typename I::PixelType& rgb ) const
 {
-  if( !this->m_Estimating )
+  if( !this->m_Estimating && this->m_ModelSupport > 0 )
   {
     this->m_Estimator->AddSample( this->m_YPbPrFunction( rgb ) );
-    if( this->m_Estimator->GetNumberOfSamples( ) == this->m_ModelSupport )
-    {
+    if( this->m_Estimator->GetNumberOfSamples( ) == this->m_RealModelSupport )
       this->m_Estimating = true;
-      this->m_Estimator->UpdateModel( );
-
-    } // fi
     return( true );
   }
   else
   {
     S p = this->m_Estimator->Probability( this->m_YPbPrFunction( rgb ) );
-    return( p >= this->m_Estimator->GetMinimumProbability( ) );
+    return( p >= 0.3 );
 
   } // fi
 }
@@ -30,7 +56,8 @@ template< class I, class S >
 fpa::Image::Functors::GaussianModelEstimatorFunction< I, S >::
 GaussianModelEstimatorFunction( )
   : Superclass( ),
-    m_ModelSupport( 10 )
+    m_ModelSupport( 10 ),
+    m_RealModelSupport( 10 )
 {
   this->m_Estimator = TEstimator::New( );
   this->m_Estimator->Clear( );