From fe1b7268c7eba0a317bb78e83e0463c8c4e370a9 Mon Sep 17 00:00:00 2001 From: Guillaume Pasero <guillaume.pasero@c-s.fr> Date: Mon, 11 Dec 2017 16:02:31 +0100 Subject: [PATCH] STYLE: better readability --- .../include/otbDimensionalityReductionModelFactory.h | 4 +++- .../include/otbDimensionalityReductionModelFactory.txx | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Modules/Learning/DimensionalityReductionLearning/include/otbDimensionalityReductionModelFactory.h b/Modules/Learning/DimensionalityReductionLearning/include/otbDimensionalityReductionModelFactory.h index d088b5394d..9bbd28bc0b 100644 --- a/Modules/Learning/DimensionalityReductionLearning/include/otbDimensionalityReductionModelFactory.h +++ b/Modules/Learning/DimensionalityReductionLearning/include/otbDimensionalityReductionModelFactory.h @@ -46,7 +46,9 @@ public: itkTypeMacro(DimensionalityReductionModelFactory, itk::Object); /** Convenient typedefs. */ - typedef otb::MachineLearningModel<itk::VariableLengthVector< TInputValue> , itk::VariableLengthVector< TOutputValue>> DimensionalityReductionModelType; + typedef otb::MachineLearningModel< + itk::VariableLengthVector< TInputValue >, + itk::VariableLengthVector< TOutputValue> > DimensionalityReductionModelType; typedef typename DimensionalityReductionModelType::Pointer DimensionalityReductionModelTypePointer; /** Mode in which the files is intended to be used */ diff --git a/Modules/Learning/DimensionalityReductionLearning/include/otbDimensionalityReductionModelFactory.txx b/Modules/Learning/DimensionalityReductionLearning/include/otbDimensionalityReductionModelFactory.txx index f289ab83d9..451fce5b7c 100644 --- a/Modules/Learning/DimensionalityReductionLearning/include/otbDimensionalityReductionModelFactory.txx +++ b/Modules/Learning/DimensionalityReductionLearning/include/otbDimensionalityReductionModelFactory.txx @@ -52,7 +52,7 @@ using SOM5DModelFactory = SOMModelFactory<TInputValue, TTargetValue, 5> ; template <class TInputValue, class TOutputValue> -typename MachineLearningModel<itk::VariableLengthVector< TInputValue>, itk::VariableLengthVector< TOutputValue> >::Pointer +typename DimensionalityReductionModelFactory<TInputValue,TOutputValue>::DimensionalityReductionModelTypePointer DimensionalityReductionModelFactory<TInputValue,TOutputValue> ::CreateDimensionalityReductionModel(const std::string& path, FileModeType mode) { @@ -65,7 +65,8 @@ DimensionalityReductionModelFactory<TInputValue,TOutputValue> for(std::list<LightObject::Pointer>::iterator i = allobjects.begin(); i != allobjects.end(); ++i) { - MachineLearningModel<itk::VariableLengthVector< TInputValue> , itk::VariableLengthVector< TOutputValue>> * io = dynamic_cast<MachineLearningModel<itk::VariableLengthVector< TInputValue> , itk::VariableLengthVector< TOutputValue>>*>(i->GetPointer()); + DimensionalityReductionModelType* io = + dynamic_cast<DimensionalityReductionModelType*>(i->GetPointer()); if(io) { possibleDimensionalityReductionModel.push_back(io); -- GitLab