From dc87bec478012c8bfa6991c4e3a8788905c0d515 Mon Sep 17 00:00:00 2001
From: Guillaume Pasero <guillaume.pasero@c-s.fr>
Date: Mon, 11 Dec 2017 16:03:07 +0100
Subject: [PATCH] ENH: use the InputSampleList from mother class
---
.../include/otbDimensionalityReductionTrainSOM.txx | 2 +-
.../DimensionalityReductionLearning/include/otbSOMModel.h | 4 ----
.../DimensionalityReductionLearning/include/otbSOMModel.txx | 2 +-
3 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/Modules/Applications/AppDimensionalityReduction/include/otbDimensionalityReductionTrainSOM.txx b/Modules/Applications/AppDimensionalityReduction/include/otbDimensionalityReductionTrainSOM.txx
index 535c839e73..17067cc4bd 100644
--- a/Modules/Applications/AppDimensionalityReduction/include/otbDimensionalityReductionTrainSOM.txx
+++ b/Modules/Applications/AppDimensionalityReduction/include/otbDimensionalityReductionTrainSOM.txx
@@ -158,7 +158,7 @@ void TrainDimensionalityReductionApplicationBase<TInputValue,TOutputValue>
radius[i]=std::stoi(n[i]);
}
dimredTrainer->SetNeighborhoodSizeInit(radius);
- dimredTrainer->SetListSample(trainingListSample);
+ dimredTrainer->SetInputListSample(trainingListSample);
dimredTrainer->Train();
dimredTrainer->Save(modelPath);
}
diff --git a/Modules/Learning/DimensionalityReductionLearning/include/otbSOMModel.h b/Modules/Learning/DimensionalityReductionLearning/include/otbSOMModel.h
index 0e5bbaca1f..7f6fb2b08e 100644
--- a/Modules/Learning/DimensionalityReductionLearning/include/otbSOMModel.h
+++ b/Modules/Learning/DimensionalityReductionLearning/include/otbSOMModel.h
@@ -100,8 +100,6 @@ public:
itkGetMacro(RandomInit, bool);
itkSetMacro(Seed, unsigned int);
itkGetMacro(Seed, unsigned int);
- itkGetObjectMacro(ListSample, InputListSampleType);
- itkSetObjectMacro(ListSample, InputListSampleType);
bool CanReadFile(const std::string & filename);
bool CanWriteFile(const std::string & filename);
@@ -140,8 +138,6 @@ private:
bool m_RandomInit;
/** Seed for random initialization */
unsigned int m_Seed;
- /** The input list sample */
- ListSamplePointerType m_ListSample;
/** Behavior of the Learning weightening (link to the beta coefficient) */
SOMLearningBehaviorFunctorType m_BetaFunctor;
/** Behavior of the Neighborhood extent */
diff --git a/Modules/Learning/DimensionalityReductionLearning/include/otbSOMModel.txx b/Modules/Learning/DimensionalityReductionLearning/include/otbSOMModel.txx
index e0bfe52f92..bb9df24a6c 100644
--- a/Modules/Learning/DimensionalityReductionLearning/include/otbSOMModel.txx
+++ b/Modules/Learning/DimensionalityReductionLearning/include/otbSOMModel.txx
@@ -72,7 +72,7 @@ SOMModel<TInputValue, MapDimension>::Train()
{
typedef otb::SOM<InputListSampleType, MapType> EstimatorType;
typename EstimatorType::Pointer estimator = EstimatorType::New();
- estimator->SetListSample(m_ListSample);
+ estimator->SetListSample(this->GetInputListSample());
estimator->SetMapSize(m_MapSize);
estimator->SetNeighborhoodSizeInit(m_NeighborhoodSizeInit);
estimator->SetNumberOfIterations(m_NumberOfIterations);
--
GitLab