From 0d7019eba866575640f58346ceff63b23df53bb0 Mon Sep 17 00:00:00 2001
From: Guillaume Pasero <guillaume.pasero@c-s.fr>
Date: Thu, 16 Jul 2015 18:52:10 +0200
Subject: [PATCH] ENH: fix module location for MachineLearningModel
---
Modules/Core/Common/src/CMakeLists.txt | 1 -
.../Supervised}/include/otbMachineLearningModel.h | 0
.../Supervised}/include/otbMachineLearningModel.txx | 0
.../Supervised}/include/otbMachineLearningUtils.h | 0
Modules/Learning/Supervised/src/CMakeLists.txt | 1 +
.../Supervised}/src/otbMachineLearningUtils.cxx | 0
6 files changed, 1 insertion(+), 1 deletion(-)
rename Modules/{Core/Common => Learning/Supervised}/include/otbMachineLearningModel.h (100%)
rename Modules/{Core/Common => Learning/Supervised}/include/otbMachineLearningModel.txx (100%)
rename Modules/{Core/Common => Learning/Supervised}/include/otbMachineLearningUtils.h (100%)
rename Modules/{Core/Common => Learning/Supervised}/src/otbMachineLearningUtils.cxx (100%)
diff --git a/Modules/Core/Common/src/CMakeLists.txt b/Modules/Core/Common/src/CMakeLists.txt
index b82e7a357c..a01c54d6fe 100644
--- a/Modules/Core/Common/src/CMakeLists.txt
+++ b/Modules/Core/Common/src/CMakeLists.txt
@@ -1,7 +1,6 @@
set(OTBCommon_SRC
otbStandardFilterWatcher.cxx
otbFilterWatcherBase.cxx
- otbMachineLearningUtils.cxx
otbSystem.cxx
otbStandardWriterWatcher.cxx
otbUtils.cxx
diff --git a/Modules/Core/Common/include/otbMachineLearningModel.h b/Modules/Learning/Supervised/include/otbMachineLearningModel.h
similarity index 100%
rename from Modules/Core/Common/include/otbMachineLearningModel.h
rename to Modules/Learning/Supervised/include/otbMachineLearningModel.h
diff --git a/Modules/Core/Common/include/otbMachineLearningModel.txx b/Modules/Learning/Supervised/include/otbMachineLearningModel.txx
similarity index 100%
rename from Modules/Core/Common/include/otbMachineLearningModel.txx
rename to Modules/Learning/Supervised/include/otbMachineLearningModel.txx
diff --git a/Modules/Core/Common/include/otbMachineLearningUtils.h b/Modules/Learning/Supervised/include/otbMachineLearningUtils.h
similarity index 100%
rename from Modules/Core/Common/include/otbMachineLearningUtils.h
rename to Modules/Learning/Supervised/include/otbMachineLearningUtils.h
diff --git a/Modules/Learning/Supervised/src/CMakeLists.txt b/Modules/Learning/Supervised/src/CMakeLists.txt
index aa05eb7b99..67598c94a1 100644
--- a/Modules/Learning/Supervised/src/CMakeLists.txt
+++ b/Modules/Learning/Supervised/src/CMakeLists.txt
@@ -1,5 +1,6 @@
set(OTBSupervised_SRC
otbMachineLearningModelFactoryBase.cxx
+ otbMachineLearningUtils.cxx
)
add_library(OTBSupervised ${OTBSupervised_SRC})
diff --git a/Modules/Core/Common/src/otbMachineLearningUtils.cxx b/Modules/Learning/Supervised/src/otbMachineLearningUtils.cxx
similarity index 100%
rename from Modules/Core/Common/src/otbMachineLearningUtils.cxx
rename to Modules/Learning/Supervised/src/otbMachineLearningUtils.cxx
--
GitLab