PathListToHistogramGenerator : implémentation de la classe et des testing

Code/Common/otbPathListToHistogramGenerator.h

@@ -28,6 +28,8 @@
 
 namespace otb {
 
+
+
 /** \class PathListToHistogramGenerator
  *  \brief This class generates an histogram from a list of path.
  *
@@ -64,11 +66,13 @@ public:
 
   typedef TFunction                                       FunctionType;
 
-  typedef double                                                   MeasurementType;
-  typedef itk::Vector< MeasurementType , 1 >                       ListSampleVectorType ;
+  typedef typename TFunction::OutputType                  RealType;
+
+  typedef RealType                                                 MeasurementType;
+  typedef itk::Vector< MeasurementType ,1 >                        ListSampleVectorType ;
   typedef itk::Statistics::ListSample< ListSampleVectorType >      ListSampleType ;
-  typedef ListSampleType::Pointer                                  ListSamplePointer;
-  typedef ListSampleType::ConstPointer                             ListSampleConstPointer;
+  typedef typename ListSampleType::Pointer                         ListSamplePointer;
+  typedef typename ListSampleType::ConstPointer                    ListSampleConstPointer;
   
   typedef itk::Statistics::DenseFrequencyContainer        FrequencyContainerType;
 

Code/Common/otbPathListToHistogramGenerator.txx

@@ -58,8 +58,28 @@ void
 PathListToHistogramGenerator< TPath, TFunction >
 ::Compute() 
 {
- //TODO
-  m_HistogramGenerator->Update();
+	
+    PathPointer vertexList;
+    
+    ListSamplePointer  ListSample = ListSampleType::New();
+    int nbElementPathList = m_PathList->size();
+ 
+    ListSampleVectorType ResultFunction;
+    
+    typename TFunction::Pointer function = TFunction::New();
+   
+    for(int noPathList = 0 ; noPathList < nbElementPathList; noPathList++ )
+    {
+       vertexList = (*m_PathList)[noPathList]; 
+       function->SetInputPath( vertexList );
+       
+       ResultFunction[0] = static_cast<MeasurementType>( function->Evaluate() );
+       ListSample->PushBack(ResultFunction);
+
+    }
+
+    m_HistogramGenerator->SetListSample( ListSample ) ;
+    m_HistogramGenerator->Update();
 }
 
 

Testing/Code/Common/CMakeLists.txt

@@ -219,7 +219,7 @@ ADD_TEST(coTuPathListToHistogramGeneratorNew ${COMMON_TESTS}
          otbPathListToHistogramGeneratorNew)  
 
 ADD_TEST(coTuPathListToHistogramGenerator ${COMMON_TESTS} 
-         otbPathListToHistogramGenerator)  
+         otbPathListToHistogramGenerator 100 2)  
          
 # -------       Fichiers sources CXX -----------------------------------
 SET(BasicCommon_SRCS

Testing/Code/Common/otbPathListToHistogramGenerator.cxx

@@ -32,6 +32,8 @@ int otbPathListToHistogramGenerator( int argc, char* argv[] )
 {
   try 
     {         
+        unsigned int  NbOfBins((unsigned int)::atoi(argv[1]));
+        unsigned int  NbOfPointsPerHistogram((unsigned int)::atoi(argv[2]));
         const   unsigned int        	                       Dimension = 2;
 	typedef itk::PolyLineParametricPath< Dimension >       PathType;
         typedef PathType::Pointer                              PathPointer;
@@ -42,10 +44,10 @@ int otbPathListToHistogramGenerator( int argc, char* argv[] )
         typedef otb::PathListToHistogramGenerator< PathType,FunctionType >   HistogramGeneratorType;
 	
         PathType::ContinuousIndexType cindex;
-	int NbAngle = 100;
-	
+	int NbAngle = NbOfPointsPerHistogram*NbOfBins;
+
         /* build segments list */
-	PathListType*  PathList;
+	PathListType*  PathList = new PathListType;
         PathList->clear();
 	
 	for(int i = 0 ; i <NbAngle ; i++)
@@ -64,12 +66,11 @@ int otbPathListToHistogramGenerator( int argc, char* argv[] )
 	    PathList->push_back(pathElt); 
 	}
 
-	
 	HistogramGeneratorType::Pointer histogramGenerator = HistogramGeneratorType::New();
 
         typedef HistogramGeneratorType::SizeType   HistogramSizeType;
 	HistogramSizeType hsize;
-        hsize[0] = 127;  // number of bins for the Red   channel
+        hsize[0] = NbOfBins;  // number of bins for the Red   channel
 	
         histogramGenerator->SetInput(  PathList  );
         histogramGenerator->SetNumberOfBins( hsize );
@@ -86,7 +87,12 @@ int otbPathListToHistogramGenerator( int argc, char* argv[] )
 
        for( unsigned int bin=0; bin < histogramSize; bin++ )
        {
-            std::cout << "bin = " << bin << " frequency = ";
+            if(histogram->GetFrequency( bin, 0 ) !=NbOfPointsPerHistogram)
+	    {
+    			std::cout << "Error in histogram value !" << std::endl; 
+                        return EXIT_FAILURE; 
+	    }	    
+	    std::cout << "bin = " << bin << " frequency = ";
             std::cout << histogram->GetFrequency( bin, 0 ) << std::endl;
        }