From eef3cce42b8dc9fab6002791755f624250f2a9b5 Mon Sep 17 00:00:00 2001
From: Ludovic Hussonnois <ludovic.hussonnois@c-s.fr>
Date: Fri, 10 Mar 2017 10:41:37 +0100
Subject: [PATCH] REFAC: Move function and remove comment.
---
.../include/otbLearningApplicationBase.h | 11 ++--------
.../include/otbLearningApplicationBase.txx | 22 +++++++++----------
2 files changed, 13 insertions(+), 20 deletions(-)
diff --git a/Modules/Applications/AppClassification/include/otbLearningApplicationBase.h b/Modules/Applications/AppClassification/include/otbLearningApplicationBase.h
index 1bd3c131d1..f7a7c3e654 100644
--- a/Modules/Applications/AppClassification/include/otbLearningApplicationBase.h
+++ b/Modules/Applications/AppClassification/include/otbLearningApplicationBase.h
@@ -154,17 +154,10 @@ public:
/**
* Retrieve the classifier category (supervisde or unsupervised)
- * based on the select algorithm from the classifier choice
+ * based on the select algorithm from the classifier choice.
* @return ClassifierCategory the classifier category
*/
- inline ClassifierCategory GetClassifierCategory()
- {
- std::cout << GetParameterString("classifier") << std::endl;
- bool foundUnsupervised =
- std::find(m_UnsupervisedClassifier.begin(), m_UnsupervisedClassifier.end(),
- GetParameterString("classifier")) != m_UnsupervisedClassifier.end();
- return foundUnsupervised ? Unsupervised : Supervised;
- }
+ ClassifierCategory GetClassifierCategory();
protected:
LearningApplicationBase();
diff --git a/Modules/Applications/AppClassification/include/otbLearningApplicationBase.txx b/Modules/Applications/AppClassification/include/otbLearningApplicationBase.txx
index 74830ffcb4..adbe6db9ca 100644
--- a/Modules/Applications/AppClassification/include/otbLearningApplicationBase.txx
+++ b/Modules/Applications/AppClassification/include/otbLearningApplicationBase.txx
@@ -63,22 +63,22 @@ LearningApplicationBase<TInputValue,TOutputValue>
m_UnsupervisedClassifier.assign(allClassifier.begin() + m_SupervisedClassifier.size(), allClassifier.end());
}
+template <class TInputValue, class TOutputValue>
+typename LearningApplicationBase<TInputValue,TOutputValue>::ClassifierCategory
+LearningApplicationBase<TInputValue,TOutputValue>
+::GetClassifierCategory()
+{
+ bool foundUnsupervised =
+ std::find(m_UnsupervisedClassifier.begin(), m_UnsupervisedClassifier.end(),
+ GetParameterString("classifier")) != m_UnsupervisedClassifier.end();
+ return foundUnsupervised ? Unsupervised : Supervised;
+}
+
template <class TInputValue, class TOutputValue>
void
LearningApplicationBase<TInputValue,TOutputValue>
::DoUpdateParameters()
{
- /*
- // if the classifier category is changed, reload the corresponding classifier
- if( HasValue( "category" ) )
- {
- //ClearChoices( "classifier" );
- if( GetParameterString( "category" ) == "supervised" )
- InitSupervisedClassifierParams();
- else
- InitUnsupervisedClassifierParams();
- }
- */
};
template <class TInputValue, class TOutputValue>
--
GitLab