From 9bb41c0ae46cce5585fdd26471608cbd91f12b9f Mon Sep 17 00:00:00 2001
From: Guillaume Pasero <guillaume.pasero@c-s.fr>
Date: Mon, 4 Dec 2017 18:27:52 +0100
Subject: [PATCH] ENH: rename AutoencoderModelFactoryBase into
 AutoencoderModelFactory to match filename

---
 .../include/otbAutoencoderModelFactory.h           | 14 +++++++-------
 .../include/otbAutoencoderModelFactory.txx         |  8 ++++----
 .../otbDimensionalityReductionModelFactory.txx     |  8 ++++----
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModelFactory.h b/Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModelFactory.h
index b94b3b8154..ca411f0e70 100644
--- a/Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModelFactory.h
+++ b/Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModelFactory.h
@@ -30,11 +30,11 @@ namespace otb
 {
 	
 template <class TInputValue, class TTargetValue, class NeuronType>
-class ITK_EXPORT AutoencoderModelFactoryBase : public itk::ObjectFactoryBase
+class ITK_EXPORT AutoencoderModelFactory : public itk::ObjectFactoryBase
 {
 public:
   /** Standard class typedefs. */
-  typedef AutoencoderModelFactoryBase   Self;
+  typedef AutoencoderModelFactory   Self;
   typedef itk::ObjectFactoryBase        Superclass;
   typedef itk::SmartPointer<Self>       Pointer;
   typedef itk::SmartPointer<const Self> ConstPointer;
@@ -47,21 +47,21 @@ public:
   itkFactorylessNewMacro(Self);
 
   /** Run-time type information (and related methods). */
-  itkTypeMacro(AutoencoderModelFactoryBase, itk::ObjectFactoryBase);
+  itkTypeMacro(AutoencoderModelFactory, itk::ObjectFactoryBase);
 
   /** Register one factory of this type  */
   static void RegisterOneFactory(void)
   {
-    Pointer AEFactory = AutoencoderModelFactoryBase::New();
+    Pointer AEFactory = AutoencoderModelFactory::New();
     itk::ObjectFactoryBase::RegisterFactory(AEFactory);
   }
 
 protected:
-  AutoencoderModelFactoryBase();
-  ~AutoencoderModelFactoryBase() ITK_OVERRIDE;
+  AutoencoderModelFactory();
+  ~AutoencoderModelFactory() ITK_OVERRIDE;
 
 private:
-  AutoencoderModelFactoryBase(const Self &); //purposely not implemented
+  AutoencoderModelFactory(const Self &); //purposely not implemented
   void operator =(const Self&); //purposely not implemented
 
 };
diff --git a/Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModelFactory.txx b/Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModelFactory.txx
index b7c8a231d7..53201871ab 100644
--- a/Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModelFactory.txx
+++ b/Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModelFactory.txx
@@ -30,7 +30,7 @@
 namespace otb
 {
 template <class TInputValue, class TOutputValue, class NeuronType>
-AutoencoderModelFactoryBase<TInputValue,TOutputValue, NeuronType>::AutoencoderModelFactoryBase()
+AutoencoderModelFactory<TInputValue,TOutputValue, NeuronType>::AutoencoderModelFactory()
 {
 
   std::string classOverride = std::string("DimensionalityReductionModel");
@@ -45,18 +45,18 @@ AutoencoderModelFactoryBase<TInputValue,TOutputValue, NeuronType>::AutoencoderMo
 }
 
 template <class TInputValue, class TOutputValue, class NeuronType>
-AutoencoderModelFactoryBase<TInputValue,TOutputValue, NeuronType>::~AutoencoderModelFactoryBase()
+AutoencoderModelFactory<TInputValue,TOutputValue, NeuronType>::~AutoencoderModelFactory()
 {
 }
 
 template <class TInputValue, class TOutputValue, class NeuronType>
-const char* AutoencoderModelFactoryBase<TInputValue,TOutputValue, NeuronType>::GetITKSourceVersion(void) const
+const char* AutoencoderModelFactory<TInputValue,TOutputValue, NeuronType>::GetITKSourceVersion(void) const
 {
   return ITK_SOURCE_VERSION;
 }
 
 template <class TInputValue, class TOutputValue, class NeuronType>
-const char* AutoencoderModelFactoryBase<TInputValue,TOutputValue, NeuronType>::GetDescription() const
+const char* AutoencoderModelFactory<TInputValue,TOutputValue, NeuronType>::GetDescription() const
 {
   return "Autoencoder model factory";
 }
diff --git a/Modules/Learning/DimensionalityReductionLearning/include/otbDimensionalityReductionModelFactory.txx b/Modules/Learning/DimensionalityReductionLearning/include/otbDimensionalityReductionModelFactory.txx
index 7eeeda6d5a..5a9b9b7740 100644
--- a/Modules/Learning/DimensionalityReductionLearning/include/otbDimensionalityReductionModelFactory.txx
+++ b/Modules/Learning/DimensionalityReductionLearning/include/otbDimensionalityReductionModelFactory.txx
@@ -38,7 +38,7 @@ namespace otb
 
 
 template <class TInputValue, class TTargetValue>
-using AutoencoderModelFactory = AutoencoderModelFactoryBase<TInputValue, TTargetValue, shark::LogisticNeuron>  ;
+using LogAutoencoderModelFactory = AutoencoderModelFactory<TInputValue, TTargetValue, shark::LogisticNeuron>  ;
 
 
 template <class TInputValue, class TTargetValue>
@@ -121,7 +121,7 @@ DimensionalityReductionModelFactory<TInputValue,TOutputValue>
   
 #ifdef OTB_USE_SHARK
   RegisterFactory(PCAModelFactory<TInputValue,TOutputValue>::New());
-  RegisterFactory(AutoencoderModelFactory<TInputValue,TOutputValue>::New());
+  RegisterFactory(LogAutoencoderModelFactory<TInputValue,TOutputValue>::New());
   // RegisterFactory(TiedAutoencoderModelFactory<TInputValue,TOutputValue>::New());
 #endif
   
@@ -188,8 +188,8 @@ DimensionalityReductionModelFactory<TInputValue,TOutputValue>
       
 #ifdef OTB_USE_SHARK
 	
-    AutoencoderModelFactory<TInputValue,TOutputValue> *aeFactory =
-      dynamic_cast<AutoencoderModelFactory<TInputValue,TOutputValue> *>(*itFac);
+    LogAutoencoderModelFactory<TInputValue,TOutputValue> *aeFactory =
+      dynamic_cast<LogAutoencoderModelFactory<TInputValue,TOutputValue> *>(*itFac);
     if (aeFactory)
       {
       itk::ObjectFactoryBase::UnRegisterFactory(aeFactory);
-- 
GitLab