From de61ad85dfc90d3724a7ceb0323ecabfee67b81c Mon Sep 17 00:00:00 2001
From: Jonathan Guinet <jonathan.guinet@c-s.fr>
Date: Thu, 18 Apr 2013 15:44:42 +0200
Subject: [PATCH] ENH: add vfn option in ValidateImageClassifier application to
be consistent with training application.
---
.../Classification/otbValidateImagesClassifier.cxx | 7 ++++++-
.../Classification/otbValidateSVMImagesClassifier.cxx | 9 ++++++++-
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/Applications/Classification/otbValidateImagesClassifier.cxx b/Applications/Classification/otbValidateImagesClassifier.cxx
index d8b6f4c02f..c5aad934c9 100644
--- a/Applications/Classification/otbValidateImagesClassifier.cxx
+++ b/Applications/Classification/otbValidateImagesClassifier.cxx
@@ -120,6 +120,11 @@ private:
SetParameterDescription("il", "Input image list filename.");
AddParameter(ParameterType_InputVectorDataList, "vd", "Vector Data List");
SetParameterDescription("vd", "List of vector data to select validation samples.");
+ AddParameter(ParameterType_String, "vfn", "Name of the discrimination field");
+ SetParameterDescription("vfn", "Name of the field used to discriminate class in the vector data files.");
+ SetParameterString("vfn", "Class");
+ MandatoryOff("vfn");
+
AddParameter(ParameterType_InputFilename, "imstat", "XML image statistics file");
MandatoryOff("imstat");
SetParameterDescription("imstat", "Filename of an XML file containing mean and standard deviation of input images.");
@@ -277,7 +282,7 @@ private:
sampleGenerator->SetInputVectorData(vdreproj->GetOutput());
sampleGenerator->SetValidationTrainingProportion(1.0); // All in validation
- sampleGenerator->SetClassKey("Class");
+ sampleGenerator->SetClassKey(GetParameterString("vfn"));
sampleGenerator->Update();
diff --git a/Applications/Classification/otbValidateSVMImagesClassifier.cxx b/Applications/Classification/otbValidateSVMImagesClassifier.cxx
index 1063aa3090..e334704fc7 100644
--- a/Applications/Classification/otbValidateSVMImagesClassifier.cxx
+++ b/Applications/Classification/otbValidateSVMImagesClassifier.cxx
@@ -133,6 +133,11 @@ private:
SetParameterDescription("il", "Input image list filename.");
AddParameter(ParameterType_InputVectorDataList, "vd", "Vector Data List");
SetParameterDescription("vd", "List of vector data to select validation samples.");
+ AddParameter(ParameterType_String, "vfn", "Name of the discrimination field");
+ SetParameterDescription("vfn", "Name of the field used to discriminate class in the vector data files.");
+ SetParameterString("vfn", "Class");
+ MandatoryOff("vfn");
+
AddParameter(ParameterType_InputFilename, "imstat", "XML image statistics file");
MandatoryOff("imstat");
SetParameterDescription("imstat", "Filename of an XML file containing mean and standard deviation of input images.");
@@ -290,7 +295,7 @@ private:
sampleGenerator->SetInputVectorData(vdreproj->GetOutput());
sampleGenerator->SetValidationTrainingProportion(1.0); // All in validation
- sampleGenerator->SetClassKey("Class");
+ sampleGenerator->SetClassKey(GetParameterString("vfn"));
sampleGenerator->Update();
@@ -400,3 +405,5 @@ private:
} // end of namespace otb
OTB_APPLICATION_EXPORT(otb::Wrapper::ValidateSVMImagesClassifier)
+
+
--
GitLab