Commit ee51b587 authored by Guillaume Pasero's avatar Guillaume Pasero
Browse files

ENH: move all MachineLearningModelFactoryBase to LearningBase

No related merge requests found
Showing with 37 additions and 3 deletions
+37 -3
...@@ -20,4 +20,6 @@ ...@@ -20,4 +20,6 @@
project(OTBLearningBase) project(OTBLearningBase)
set(OTBLearningBase_LIBRARIES OTBLearningBase)
otb_module_impl() otb_module_impl()
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#define otbMachineLearningModelFactoryBase_h #define otbMachineLearningModelFactoryBase_h
#include "itkMutexLock.h" #include "itkMutexLock.h"
#include "OTBSupervisedExport.h" #include "OTBLearningBaseExport.h"
namespace otb namespace otb
{ {
...@@ -34,7 +34,7 @@ namespace otb ...@@ -34,7 +34,7 @@ namespace otb
* *
* \ingroup OTBLearningBase * \ingroup OTBLearningBase
*/ */
class OTBSupervised_EXPORT MachineLearningModelFactoryBase : public itk::Object class OTBLearningBase_EXPORT MachineLearningModelFactoryBase : public itk::Object
{ {
public: public:
/** Standard class typedefs. */ /** Standard class typedefs. */
......
...@@ -22,6 +22,7 @@ set(DOCUMENTATION "This module contains OTB generic Machine Learning framework ...@@ -22,6 +22,7 @@ set(DOCUMENTATION "This module contains OTB generic Machine Learning framework
mainly based on OpenCV.") mainly based on OpenCV.")
otb_module(OTBLearningBase otb_module(OTBLearningBase
ENABLE_SHARED
DEPENDS DEPENDS
OTBCommon OTBCommon
OTBITK OTBITK
......
#
# Copyright (C) 2005-2017 Centre National d'Etudes Spatiales (CNES)
#
# This file is part of Orfeo Toolbox
#
# https://www.orfeo-toolbox.org/
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
set(OTBLearningBase_SRC
otbMachineLearningModelFactoryBase.cxx
)
add_library(OTBLearningBase ${OTBLearningBase_SRC})
target_link_libraries(OTBLearningBase
${OTBCommon_LIBRARIES}
${OTBITK_LIBRARIES}
)
otb_module_target(OTBLearningBase)
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
# #
set(OTBSupervised_SRC set(OTBSupervised_SRC
otbMachineLearningModelFactoryBase.cxx
otbExhaustiveExponentialOptimizer.cxx otbExhaustiveExponentialOptimizer.cxx
) )
...@@ -33,6 +32,7 @@ target_link_libraries(OTBSupervised ...@@ -33,6 +32,7 @@ target_link_libraries(OTBSupervised
${OTBLibSVM_LIBRARIES} ${OTBLibSVM_LIBRARIES}
${OTBOpenCV_LIBRARIES} ${OTBOpenCV_LIBRARIES}
${OTBShark_LIBRARIES} ${OTBShark_LIBRARIES}
${OTBLearningBase_LIBRARIES}
) )
otb_module_target(OTBSupervised) otb_module_target(OTBSupervised)
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment