From cbb52d21b0b7b1823a37282a514a5ab48eb6f2ff Mon Sep 17 00:00:00 2001
From: Ludovic Hussonnois <ludovic.hussonnois@c-s.fr>
Date: Wed, 29 Mar 2017 10:44:12 +0100
Subject: [PATCH] REFAC: Remove unused class member.
---
.../app/otbTrainImagesClassifier.cxx | 20 +------------------
.../include/otbTrainImagesBase.h | 4 ----
.../include/otbTrainImagesBase.txx | 1 -
3 files changed, 1 insertion(+), 24 deletions(-)
diff --git a/Modules/Applications/AppClassification/app/otbTrainImagesClassifier.cxx b/Modules/Applications/AppClassification/app/otbTrainImagesClassifier.cxx
index 0257460b73..2a84ff53e7 100644
--- a/Modules/Applications/AppClassification/app/otbTrainImagesClassifier.cxx
+++ b/Modules/Applications/AppClassification/app/otbTrainImagesClassifier.cxx
@@ -90,24 +90,6 @@ public:
{
UpdatePolygonClassStatisticsParameters();
}
-
-
- // Change mandatory of input vector depending on supervised and unsupervised mode.
-// if( HasValue( "classifier" ) )
-// {
-// UpdateInternalParameters( "training" );
-// switch( trainVectorBase->GetClassifierCategory() )
-// {
-// case TrainVectorBase::Unsupervised:
-// MandatoryOff( "io.vd" );
-// break;
-// default:
-// case TrainVectorBase::Supervised:
-// MandatoryOn( "io.vd" );
-// break;
-// }
-// }
-
}
/**
@@ -185,7 +167,7 @@ public:
unsigned long nbInputs = imageList->Size();
- if( !HasInputVector ) // && trainVectorBase->GetClassifierCategory() == TrainVectorBase::Supervised )
+ if( !HasInputVector )
{
otbAppLogFATAL( "Missing input vector data files" );
}
diff --git a/Modules/Applications/AppClassification/include/otbTrainImagesBase.h b/Modules/Applications/AppClassification/include/otbTrainImagesBase.h
index be9ad1425f..af17e02e5d 100644
--- a/Modules/Applications/AppClassification/include/otbTrainImagesBase.h
+++ b/Modules/Applications/AppClassification/include/otbTrainImagesBase.h
@@ -20,7 +20,6 @@
#ifndef otbTrainImagesBase_h
#define otbTrainImagesBase_h
-#include "otbTrainVectorBase.h"
#include "otbVectorDataFileWriter.h"
#include "otbWrapperCompositeApplication.h"
#include "otbWrapperApplicationFactory.h"
@@ -184,9 +183,6 @@ private:
protected:
- /** Base use for training, this allow to know if the choosed classifier is supervised or unsupervised */
- TrainVectorBase* trainVectorBase;
-
struct SamplingRates
{
long int fmt;
diff --git a/Modules/Applications/AppClassification/include/otbTrainImagesBase.txx b/Modules/Applications/AppClassification/include/otbTrainImagesBase.txx
index 70bd7798b7..243086d2de 100644
--- a/Modules/Applications/AppClassification/include/otbTrainImagesBase.txx
+++ b/Modules/Applications/AppClassification/include/otbTrainImagesBase.txx
@@ -123,7 +123,6 @@ void TrainImagesBase::ConnectSamplingParameters()
void TrainImagesBase::InitClassification()
{
AddApplication( "TrainVectorClassifier", "training", "Model training" );
- trainVectorBase = dynamic_cast<TrainVectorBase*>(GetInternalApplication("training"));
AddParameter( ParameterType_InputVectorDataList, "io.valid", "Validation Vector Data List" );
SetParameterDescription( "io.valid", "A list of vector data to select the training samples." );
--
GitLab