From ffe7c1c0c47f98bc5ee389b15c76ca6c24356f57 Mon Sep 17 00:00:00 2001
From: Patrick Imbo <patrick.imbo@c-s.fr>
Date: Wed, 30 Aug 2006 14:42:13 +0000
Subject: [PATCH] =?UTF-8?q?HistogramStatisticFunction=20:=20impl=C3=A9ment?=
=?UTF-8?q?ation=20de=20la=20classe=20et=20des=20testing?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
...ion.h => otbHistogramStatisticsFunction.h} | 18 +++++++--------
...txx => otbHistogramStatisticsFunction.txx} | 22 ++++++++++---------
Testing/Code/Common/CMakeLists.txt | 6 ++---
Testing/Code/Common/otbCommonTests.cxx | 2 +-
...cxx => otbHistogramStatisticsFunction.cxx} | 16 +++++++-------
5 files changed, 33 insertions(+), 31 deletions(-)
rename Code/Common/{otbHistogramStatisticFunction.h => otbHistogramStatisticsFunction.h} (87%)
rename Code/Common/{otbHistogramStatisticFunction.txx => otbHistogramStatisticsFunction.txx} (81%)
rename Testing/Code/Common/{otbHistogramStatisticFunction.cxx => otbHistogramStatisticsFunction.cxx} (79%)
diff --git a/Code/Common/otbHistogramStatisticFunction.h b/Code/Common/otbHistogramStatisticsFunction.h
similarity index 87%
rename from Code/Common/otbHistogramStatisticFunction.h
rename to Code/Common/otbHistogramStatisticsFunction.h
index 14e4971ab0..14f49a669d 100644
--- a/Code/Common/otbHistogramStatisticFunction.h
+++ b/Code/Common/otbHistogramStatisticsFunction.h
@@ -17,15 +17,15 @@
=========================================================================*/
-#ifndef __otbHistogramStatisticFunction_h
-#define __otbHistogramStatisticFunction_h
+#ifndef __otbHistogramStatisticsFunction_h
+#define __otbHistogramStatisticsFunction_h
#include "itkHistogramAlgorithmBase.h"
namespace otb
{
-/** \class HistogramStatisticFunction
+/** \class HistogramStatisticsFunction
* \brief Computes parameters for a histogram.
*
* You plug in the target histogram using SetInputHistogram method and
@@ -36,12 +36,12 @@ namespace otb
*/
template< class TInputHistogram, class TOutput >
-class HistogramStatisticFunction :
+class HistogramStatisticsFunction :
public itk::HistogramAlgorithmBase< TInputHistogram >
{
public:
/**Standard class typedefs. */
- typedef HistogramStatisticFunction Self;
+ typedef HistogramStatisticsFunction Self;
typedef itk::HistogramAlgorithmBase<TInputHistogram> Superclass;
typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
@@ -52,7 +52,7 @@ public:
typedef typename itk::NumericTraits<MeasurementType>::RealType EntropyType;
/**Standard Macros */
- itkTypeMacro(HistogramStatisticFunction, HistogramAlgorithmsBase);
+ itkTypeMacro(HistogramStatisticsFunction, HistogramAlgorithmsBase);
itkNewMacro(Self) ;
/** Typedef for the output type */
@@ -74,8 +74,8 @@ public:
protected:
- HistogramStatisticFunction() ;
- virtual ~HistogramStatisticFunction() {}
+ HistogramStatisticsFunction() ;
+ virtual ~HistogramStatisticsFunction() {}
void PrintSelf(std::ostream& os, itk::Indent indent) const;
/** Calculates the thresholds and save them */
@@ -97,7 +97,7 @@ private:
} // end of namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
-#include "otbHistogramStatisticFunction.txx"
+#include "otbHistogramStatisticsFunction.txx"
#endif
#endif
diff --git a/Code/Common/otbHistogramStatisticFunction.txx b/Code/Common/otbHistogramStatisticsFunction.txx
similarity index 81%
rename from Code/Common/otbHistogramStatisticFunction.txx
rename to Code/Common/otbHistogramStatisticsFunction.txx
index 9b7e9d0a55..b303863a6e 100644
--- a/Code/Common/otbHistogramStatisticFunction.txx
+++ b/Code/Common/otbHistogramStatisticsFunction.txx
@@ -16,24 +16,24 @@
=========================================================================*/
-#ifndef _otbHistogramStatisticFunction_txx
-#define _otbHistogramStatisticFunction_txx
+#ifndef _otbHistogramStatisticsFunction_txx
+#define _otbHistogramStatisticsFunction_txx
-#include "otbHistogramStatisticFunction.h"
+#include "otbHistogramStatisticsFunction.h"
namespace otb
{
template< class TInputHistogram, class TOutput >
-HistogramStatisticFunction< TInputHistogram, TOutput>
-::HistogramStatisticFunction()
+HistogramStatisticsFunction< TInputHistogram, TOutput>
+::HistogramStatisticsFunction()
{
m_IsModified = true;
}
template< class TInputHistogram, class TOutput >
-typename HistogramStatisticFunction< TInputHistogram, TOutput>::OutputType
-HistogramStatisticFunction< TInputHistogram, TOutput>
+typename HistogramStatisticsFunction< TInputHistogram, TOutput>::OutputType
+HistogramStatisticsFunction< TInputHistogram, TOutput>
::GetEntropy()
{
if(m_IsModified == true)
@@ -45,7 +45,7 @@ HistogramStatisticFunction< TInputHistogram, TOutput>
template< class TInputHistogram, class TOutput >
void
-HistogramStatisticFunction< TInputHistogram, TOutput>
+HistogramStatisticsFunction< TInputHistogram, TOutput>
::CalculateEntropy()
{
typename TInputHistogram::ConstPointer histogram = m_InputHistogram;
@@ -81,9 +81,11 @@ HistogramStatisticFunction< TInputHistogram, TOutput>
}
+
+
template< class TInputHistogram, class TOutput >
void
-HistogramStatisticFunction< TInputHistogram, TOutput>
+HistogramStatisticsFunction< TInputHistogram, TOutput>
::GenerateData()
{
@@ -94,7 +96,7 @@ HistogramStatisticFunction< TInputHistogram, TOutput>
template< class TInputHistogram, class TOutput >
void
-HistogramStatisticFunction< TInputHistogram, TOutput>
+HistogramStatisticsFunction< TInputHistogram, TOutput>
::PrintSelf(std::ostream& os, itk::Indent indent) const
{
Superclass::PrintSelf(os,indent);
diff --git a/Testing/Code/Common/CMakeLists.txt b/Testing/Code/Common/CMakeLists.txt
index 20d154ba14..88dccfe845 100644
--- a/Testing/Code/Common/CMakeLists.txt
+++ b/Testing/Code/Common/CMakeLists.txt
@@ -223,8 +223,8 @@ ADD_TEST(coTuPathListToHistogramGenerator ${COMMON_TESTS}
# ------- otb::HistogramStatisticFunction ---------------------------
-ADD_TEST(coTuHistogramStatisticFunction ${COMMON_TESTS}
- otbHistogramStatisticFunction 100)
+ADD_TEST(coTuHistogramStatisticsFunction ${COMMON_TESTS}
+ otbHistogramStatisticsFunction 100)
# ------- Fichiers sources CXX -----------------------------------
SET(BasicCommon_SRCS
@@ -249,7 +249,7 @@ otbDrawLineSpatialObjectList.cxx
otbImageToLineSpatialObjectListNew.cxx
otbPathListToHistogramGeneratorNew.cxx
otbPathListToHistogramGenerator.cxx
-otbHistogramStatisticFunction.cxx
+otbHistogramStatisticsFunction.cxx
)
diff --git a/Testing/Code/Common/otbCommonTests.cxx b/Testing/Code/Common/otbCommonTests.cxx
index c14679bd50..df6d72a7f2 100644
--- a/Testing/Code/Common/otbCommonTests.cxx
+++ b/Testing/Code/Common/otbCommonTests.cxx
@@ -47,5 +47,5 @@ REGISTER_TEST(otbDrawLineSpatialObjectList);
REGISTER_TEST(otbImageToLineSpatialObjectListNew);
REGISTER_TEST(otbPathListToHistogramGeneratorNew);
REGISTER_TEST(otbPathListToHistogramGenerator);
-REGISTER_TEST(otbHistogramStatisticFunction);
+REGISTER_TEST(otbHistogramStatisticsFunction);
}
diff --git a/Testing/Code/Common/otbHistogramStatisticFunction.cxx b/Testing/Code/Common/otbHistogramStatisticsFunction.cxx
similarity index 79%
rename from Testing/Code/Common/otbHistogramStatisticFunction.cxx
rename to Testing/Code/Common/otbHistogramStatisticsFunction.cxx
index b0736a685c..b1ea12974c 100644
--- a/Testing/Code/Common/otbHistogramStatisticFunction.cxx
+++ b/Testing/Code/Common/otbHistogramStatisticsFunction.cxx
@@ -24,9 +24,9 @@
#include "itkHistogram.h"
-#include "otbHistogramStatisticFunction.h"
+#include "otbHistogramStatisticsFunction.h"
-int otbHistogramStatisticFunction(int argc, char* argv[])
+int otbHistogramStatisticsFunction(int argc, char* argv[])
{
unsigned int NbOfBins((unsigned int)::atoi(argv[1]));
@@ -51,14 +51,14 @@ int otbHistogramStatisticFunction(int argc, char* argv[])
iter.SetFrequency(1.0);
}
- typedef otb::HistogramStatisticFunction<HistogramType,MeasurementType> HistogramStatisticFunctionType;
- HistogramStatisticFunctionType::Pointer HistogramStatisticFunction = HistogramStatisticFunctionType::New();
+ typedef otb::HistogramStatisticsFunction<HistogramType,MeasurementType> HistogramStatisticsFunctionType;
+ HistogramStatisticsFunctionType::Pointer HistogramStatisticsFunction = HistogramStatisticsFunctionType::New();
- HistogramStatisticFunction->SetInputHistogram(histogram.GetPointer());
+ HistogramStatisticsFunction->SetInputHistogram(histogram.GetPointer());
MeasurementType Entropy;
- Entropy = HistogramStatisticFunction->GetEntropy();
+ Entropy = HistogramStatisticsFunction->GetEntropy();
std::cout << "Entropy 1 : " << Entropy << std::endl;
if(fabs(Entropy-log(NbOfBins))>0.00001 )
@@ -80,8 +80,8 @@ int otbHistogramStatisticFunction(int argc, char* argv[])
}
}
- HistogramStatisticFunction->Update();
- Entropy = HistogramStatisticFunction->GetEntropy();
+ HistogramStatisticsFunction->Update();
+ Entropy = HistogramStatisticsFunction->GetEntropy();
std::cout << "Entropy 2 : " << Entropy << std::endl;
if( Entropy!=0.0 )
{
--
GitLab