From 5fc58982e8c428535c1a72dfabe61e0016b851db Mon Sep 17 00:00:00 2001
From: Manuel Grizonnet <manuel.grizonnet@orfeo-toolbox.org>
Date: Fri, 25 Nov 2011 15:40:38 +0100
Subject: [PATCH] ENH:rename EstimateImagesStatistics application in
ComputeImagesStatistics
---
Applications/Classification/CMakeLists.txt | 4 ++--
...ics.cxx => otbComputeImagesStatistics.cxx} | 18 ++++++++---------
.../Classification/CMakeLists.txt | 20 +++++++++----------
3 files changed, 21 insertions(+), 21 deletions(-)
rename Applications/Classification/{otbEstimateImagesStatistics.cxx => otbComputeImagesStatistics.cxx} (87%)
diff --git a/Applications/Classification/CMakeLists.txt b/Applications/Classification/CMakeLists.txt
index b2d500a9fa..06dd84ead9 100644
--- a/Applications/Classification/CMakeLists.txt
+++ b/Applications/Classification/CMakeLists.txt
@@ -1,5 +1,5 @@
-OTB_CREATE_APPLICATION(NAME EstimateImagesStatistics
- SOURCES otbEstimateImagesStatistics.cxx
+OTB_CREATE_APPLICATION(NAME ComputeImagesStatistics
+ SOURCES otbComputeImagesStatistics.cxx
LINK_LIBRARIES OTBIO;OTBCommon;OTBBasicFilters)
OTB_CREATE_APPLICATION(NAME ImageSVMClassifier
diff --git a/Applications/Classification/otbEstimateImagesStatistics.cxx b/Applications/Classification/otbComputeImagesStatistics.cxx
similarity index 87%
rename from Applications/Classification/otbEstimateImagesStatistics.cxx
rename to Applications/Classification/otbComputeImagesStatistics.cxx
index de4331ce0e..0efc8934d0 100644
--- a/Applications/Classification/otbEstimateImagesStatistics.cxx
+++ b/Applications/Classification/otbComputeImagesStatistics.cxx
@@ -26,11 +26,11 @@ namespace otb
namespace Wrapper
{
-class EstimateImagesStatistics: public Application
+class ComputeImagesStatistics: public Application
{
public:
/** Standard class typedefs. */
- typedef EstimateImagesStatistics Self;
+ typedef ComputeImagesStatistics Self;
typedef Application Superclass;
typedef itk::SmartPointer<Self> Pointer;
typedef itk::SmartPointer<const Self> ConstPointer;
@@ -38,25 +38,25 @@ public:
/** Standard macro */
itkNewMacro(Self);
- itkTypeMacro(EstimateImagesStatistics, otb::Application);
+ itkTypeMacro(ComputeImagesStatistics, otb::Application);
private:
- EstimateImagesStatistics()
+ ComputeImagesStatistics()
{
- SetName("EstimateImagesStatistics");
+ SetName("ComputeImagesStatistics");
SetDescription("Computes global mean and standard deviation for each band from a set of images and optionally saves the results in an XML file.");
SetDocName("Compute Images second order statistics");
- SetDocLongDescription("This application computes a global mean and standard deviation for each band of a set of images and optionally saves the results in an XML file. The output XML is intended to use an input for the TrainImagesSVMClassifier application to normalize samples before learning.");
+ SetDocLongDescription("This application computes a global mean and standard deviation for each band of a set of images and optionally saves the results in an XML file. The output XML is intended to be used an input for the TrainImagesSVMClassifier application to normalize samples before learning.");
SetDocLimitations("The set of input images must have the same number of bands. Input images must be of the same number, type and order of bands.");
SetDocAuthors("OTB-Team");
SetDocSeeAlso("Documentation of the TrainImagesSVMClassifier application.");
- SetDocCLExample("otbApplicationLauncherCommandLine EstimateImagesStatistics ${OTB-BIN}/bin --il ${OTB-Data}/Input/Classification/QB_1_ortho.tif ${OTB-Data}/Input/Classification/QB_2_ortho.tif ${OTB-Data}/Input/Classification/QB_3_ortho.tif --out EstimateImageStatisticsQB123.xml");
+ SetDocCLExample("otbApplicationLauncherCommandLine ComputeImagesStatistics ${OTB-BIN}/bin --il ${OTB-Data}/Input/Classification/QB_1_ortho.tif ${OTB-Data}/Input/Classification/QB_2_ortho.tif ${OTB-Data}/Input/Classification/QB_3_ortho.tif --out EstimateImageStatisticsQB123.xml");
AddDocTag(Tags::Learning);
AddDocTag(Tags::Analysis);
}
- virtual ~EstimateImagesStatistics()
+ virtual ~ComputeImagesStatistics()
{
}
@@ -171,4 +171,4 @@ private:
}
}
-OTB_APPLICATION_EXPORT(otb::Wrapper::EstimateImagesStatistics)
+OTB_APPLICATION_EXPORT(otb::Wrapper::ComputeImagesStatistics)
diff --git a/Testing/Applications/Classification/CMakeLists.txt b/Testing/Applications/Classification/CMakeLists.txt
index a51f1e9e7b..43f6b43b0a 100644
--- a/Testing/Applications/Classification/CMakeLists.txt
+++ b/Testing/Applications/Classification/CMakeLists.txt
@@ -2,8 +2,8 @@
#--- EstimateImageStatistics ---#
# QB1 chain
-OTB_TEST_APPLICATION(NAME apTvClEstimateImagesStatisticsQB1
- APP EstimateImagesStatistics
+OTB_TEST_APPLICATION(NAME apTvClComputeImagesStatisticsQB1
+ APP ComputeImagesStatistics
OPTIONS --il ${INPUTDATA}/Classification/QB_1_ortho.tif
--out ${TEMP}/apTvClEstimateImageStatisticsQB1.xml
VALID --compare-ascii ${NOTOL}
@@ -23,7 +23,7 @@ OTB_TEST_APPLICATION(NAME apTvClTrainSVMImagesClassifierQB1
${OTBAPP_BASELINE_FILES}/clsvmModelQB1.svm
${TEMP}/clsvmModelQB1.svm)
-SET_TESTS_PROPERTIES(apTvClTrainSVMImagesClassifierQB1 PROPERTIES DEPENDS apTvClEstimateImagesStatisticsQB1)
+SET_TESTS_PROPERTIES(apTvClTrainSVMImagesClassifierQB1 PROPERTIES DEPENDS apTvClComputeImagesStatisticsQB1)
OTB_TEST_APPLICATION(NAME apTvClTrainSVMImagesClassifierQB1_allOpt
APP TrainSVMImagesClassifier
@@ -40,7 +40,7 @@ OTB_TEST_APPLICATION(NAME apTvClTrainSVMImagesClassifierQB1_allOpt
${OTBAPP_BASELINE_FILES}/clsvmModelQB1.svm
${TEMP}/clsvmModelQB1_allOpt.svm)
-SET_TESTS_PROPERTIES(apTvClTrainSVMImagesClassifierQB1_allOpt PROPERTIES DEPENDS apTvClEstimateImagesStatisticsQB1)
+SET_TESTS_PROPERTIES(apTvClTrainSVMImagesClassifierQB1_allOpt PROPERTIES DEPENDS apTvClComputeImagesStatisticsQB1)
OTB_TEST_APPLICATION(NAME apTvClValidateSVMImagesClassifierQB1
@@ -96,8 +96,8 @@ SET_TESTS_PROPERTIES(apTvClImageSVMClassifierQB3 PROPERTIES DEPENDS apTvClTrainS
#--------
# QB multi chain
-OTB_TEST_APPLICATION(NAME apTvClEstimateImagesStatisticsQB123
- APP EstimateImagesStatistics
+OTB_TEST_APPLICATION(NAME apTvClComputeImagesStatisticsQB123
+ APP ComputeImagesStatistics
OPTIONS --il ${INPUTDATA}/Classification/QB_1_ortho.tif
${INPUTDATA}/Classification/QB_2_ortho.tif
${INPUTDATA}/Classification/QB_3_ortho.tif
@@ -124,7 +124,7 @@ OTB_TEST_APPLICATION(NAME apTvClTrainSVMImagesClassifierQB123
${TEMP}/clsvmModelQB123.svm)
-SET_TESTS_PROPERTIES(apTvClTrainSVMImagesClassifierQB123 PROPERTIES DEPENDS apTvClEstimateImagesStatisticsQB123)
+SET_TESTS_PROPERTIES(apTvClTrainSVMImagesClassifierQB123 PROPERTIES DEPENDS apTvClComputeImagesStatisticsQB123)
OTB_TEST_APPLICATION(NAME apTvClValidateSVMImagesClassifierQB123
@@ -202,8 +202,8 @@ OTB_TEST_APPLICATION(NAME apTvClImageSVMClassifierQB123_6
SET_TESTS_PROPERTIES(apTvClImageSVMClassifierQB123_6 PROPERTIES DEPENDS apTvClTrainSVMImagesClassifierQB123)
-OTB_TEST_APPLICATION(NAME apTvClEstimateImagesStatisticsQB456
- APP EstimateImagesStatistics
+OTB_TEST_APPLICATION(NAME apTvClComputeImagesStatisticsQB456
+ APP ComputeImagesStatistics
OPTIONS --il ${INPUTDATA}/Classification/QB_4_extract.tif
${INPUTDATA}/Classification/QB_5_extract.tif
${INPUTDATA}/Classification/QB_6_extract.tif
@@ -230,7 +230,7 @@ OTB_TEST_APPLICATION(NAME apTvClTrainSVMImagesClassifierQB456
-SET_TESTS_PROPERTIES(apTvClTrainSVMImagesClassifierQB456 PROPERTIES DEPENDS apTvClEstimateImagesStatisticsQB456)
+SET_TESTS_PROPERTIES(apTvClTrainSVMImagesClassifierQB456 PROPERTIES DEPENDS apTvClComputeImagesStatisticsQB456)
OTB_TEST_APPLICATION(NAME apTvClValidateSVMImagesClassifierQB456
APP ValidateSVMImagesClassifier
--
GitLab