From a0a00b98fca8e58be9570342aa55ffa3a5256572 Mon Sep 17 00:00:00 2001 From: Jordi Inglada <jordi.inglada@cesbio.cnes.fr> Date: Tue, 3 Oct 2017 10:56:29 +0200 Subject: [PATCH] COMP: dependencies and renaming for module to compile --- .../AppDimensionalityReduction/otb-module.cmake | 4 +++- .../README.md | 0 .../include/AutoencoderModel.h | 0 .../include/AutoencoderModel.txx | 0 .../include/AutoencoderModelFactory.h | 0 .../include/AutoencoderModelFactory.txx | 0 .../include/DimensionalityReductionModelFactory.h | 0 .../include/DimensionalityReductionModelFactory.txx | 0 .../include/ImageDimensionalityReductionFilter.h | 0 .../include/ImageDimensionalityReductionFilter.txx | 0 .../include/PCAModel.h | 0 .../include/PCAModel.txx | 0 .../include/PCAModelFactory.h | 0 .../include/PCAModelFactory.txx | 0 .../include/SOMModel.h | 0 .../include/SOMModel.txx | 0 .../include/SOMModelFactory.h | 0 .../include/SOMModelFactory.txx | 0 .../include/cbLearningApplicationBaseDR.h | 0 .../include/cbLearningApplicationBaseDR.txx | 0 .../include/cbTrainAutoencoder.txx | 0 .../include/cbTrainPCA.txx | 0 .../include/cbTrainSOM.txx | 0 .../otb-module.cmake | 8 ++++---- 24 files changed, 7 insertions(+), 5 deletions(-) rename Modules/Learning/{DimensionalityReduction => DimensionalityReductionLearning}/README.md (100%) rename Modules/Learning/{DimensionalityReduction => DimensionalityReductionLearning}/include/AutoencoderModel.h (100%) rename Modules/Learning/{DimensionalityReduction => DimensionalityReductionLearning}/include/AutoencoderModel.txx (100%) rename Modules/Learning/{DimensionalityReduction => DimensionalityReductionLearning}/include/AutoencoderModelFactory.h (100%) rename Modules/Learning/{DimensionalityReduction => DimensionalityReductionLearning}/include/AutoencoderModelFactory.txx (100%) rename Modules/Learning/{DimensionalityReduction => DimensionalityReductionLearning}/include/DimensionalityReductionModelFactory.h (100%) rename Modules/Learning/{DimensionalityReduction => DimensionalityReductionLearning}/include/DimensionalityReductionModelFactory.txx (100%) rename Modules/Learning/{DimensionalityReduction => DimensionalityReductionLearning}/include/ImageDimensionalityReductionFilter.h (100%) rename Modules/Learning/{DimensionalityReduction => DimensionalityReductionLearning}/include/ImageDimensionalityReductionFilter.txx (100%) rename Modules/Learning/{DimensionalityReduction => DimensionalityReductionLearning}/include/PCAModel.h (100%) rename Modules/Learning/{DimensionalityReduction => DimensionalityReductionLearning}/include/PCAModel.txx (100%) rename Modules/Learning/{DimensionalityReduction => DimensionalityReductionLearning}/include/PCAModelFactory.h (100%) rename Modules/Learning/{DimensionalityReduction => DimensionalityReductionLearning}/include/PCAModelFactory.txx (100%) rename Modules/Learning/{DimensionalityReduction => DimensionalityReductionLearning}/include/SOMModel.h (100%) rename Modules/Learning/{DimensionalityReduction => DimensionalityReductionLearning}/include/SOMModel.txx (100%) rename Modules/Learning/{DimensionalityReduction => DimensionalityReductionLearning}/include/SOMModelFactory.h (100%) rename Modules/Learning/{DimensionalityReduction => DimensionalityReductionLearning}/include/SOMModelFactory.txx (100%) rename Modules/Learning/{DimensionalityReduction => DimensionalityReductionLearning}/include/cbLearningApplicationBaseDR.h (100%) rename Modules/Learning/{DimensionalityReduction => DimensionalityReductionLearning}/include/cbLearningApplicationBaseDR.txx (100%) rename Modules/Learning/{DimensionalityReduction => DimensionalityReductionLearning}/include/cbTrainAutoencoder.txx (100%) rename Modules/Learning/{DimensionalityReduction => DimensionalityReductionLearning}/include/cbTrainPCA.txx (100%) rename Modules/Learning/{DimensionalityReduction => DimensionalityReductionLearning}/include/cbTrainSOM.txx (100%) rename Modules/Learning/{DimensionalityReduction => DimensionalityReductionLearning}/otb-module.cmake (64%) diff --git a/Modules/Applications/AppDimensionalityReduction/otb-module.cmake b/Modules/Applications/AppDimensionalityReduction/otb-module.cmake index 2ee3b794a6..4b1a936de2 100644 --- a/Modules/Applications/AppDimensionalityReduction/otb-module.cmake +++ b/Modules/Applications/AppDimensionalityReduction/otb-module.cmake @@ -25,9 +25,11 @@ otb_module(OTBAppDimensionalityReduction DEPENDS OTBImageManipulation OTBStatistics + OTBIOXML OTBApplicationEngine OTBDimensionalityReduction - TEST_DEPENDS + OTBDimensionalityReductionLearning + TEST_DEPENDS OTBTestKernel OTBCommandLine diff --git a/Modules/Learning/DimensionalityReduction/README.md b/Modules/Learning/DimensionalityReductionLearning/README.md similarity index 100% rename from Modules/Learning/DimensionalityReduction/README.md rename to Modules/Learning/DimensionalityReductionLearning/README.md diff --git a/Modules/Learning/DimensionalityReduction/include/AutoencoderModel.h b/Modules/Learning/DimensionalityReductionLearning/include/AutoencoderModel.h similarity index 100% rename from Modules/Learning/DimensionalityReduction/include/AutoencoderModel.h rename to Modules/Learning/DimensionalityReductionLearning/include/AutoencoderModel.h diff --git a/Modules/Learning/DimensionalityReduction/include/AutoencoderModel.txx b/Modules/Learning/DimensionalityReductionLearning/include/AutoencoderModel.txx similarity index 100% rename from Modules/Learning/DimensionalityReduction/include/AutoencoderModel.txx rename to Modules/Learning/DimensionalityReductionLearning/include/AutoencoderModel.txx diff --git a/Modules/Learning/DimensionalityReduction/include/AutoencoderModelFactory.h b/Modules/Learning/DimensionalityReductionLearning/include/AutoencoderModelFactory.h similarity index 100% rename from Modules/Learning/DimensionalityReduction/include/AutoencoderModelFactory.h rename to Modules/Learning/DimensionalityReductionLearning/include/AutoencoderModelFactory.h diff --git a/Modules/Learning/DimensionalityReduction/include/AutoencoderModelFactory.txx b/Modules/Learning/DimensionalityReductionLearning/include/AutoencoderModelFactory.txx similarity index 100% rename from Modules/Learning/DimensionalityReduction/include/AutoencoderModelFactory.txx rename to Modules/Learning/DimensionalityReductionLearning/include/AutoencoderModelFactory.txx diff --git a/Modules/Learning/DimensionalityReduction/include/DimensionalityReductionModelFactory.h b/Modules/Learning/DimensionalityReductionLearning/include/DimensionalityReductionModelFactory.h similarity index 100% rename from Modules/Learning/DimensionalityReduction/include/DimensionalityReductionModelFactory.h rename to Modules/Learning/DimensionalityReductionLearning/include/DimensionalityReductionModelFactory.h diff --git a/Modules/Learning/DimensionalityReduction/include/DimensionalityReductionModelFactory.txx b/Modules/Learning/DimensionalityReductionLearning/include/DimensionalityReductionModelFactory.txx similarity index 100% rename from Modules/Learning/DimensionalityReduction/include/DimensionalityReductionModelFactory.txx rename to Modules/Learning/DimensionalityReductionLearning/include/DimensionalityReductionModelFactory.txx diff --git a/Modules/Learning/DimensionalityReduction/include/ImageDimensionalityReductionFilter.h b/Modules/Learning/DimensionalityReductionLearning/include/ImageDimensionalityReductionFilter.h similarity index 100% rename from Modules/Learning/DimensionalityReduction/include/ImageDimensionalityReductionFilter.h rename to Modules/Learning/DimensionalityReductionLearning/include/ImageDimensionalityReductionFilter.h diff --git a/Modules/Learning/DimensionalityReduction/include/ImageDimensionalityReductionFilter.txx b/Modules/Learning/DimensionalityReductionLearning/include/ImageDimensionalityReductionFilter.txx similarity index 100% rename from Modules/Learning/DimensionalityReduction/include/ImageDimensionalityReductionFilter.txx rename to Modules/Learning/DimensionalityReductionLearning/include/ImageDimensionalityReductionFilter.txx diff --git a/Modules/Learning/DimensionalityReduction/include/PCAModel.h b/Modules/Learning/DimensionalityReductionLearning/include/PCAModel.h similarity index 100% rename from Modules/Learning/DimensionalityReduction/include/PCAModel.h rename to Modules/Learning/DimensionalityReductionLearning/include/PCAModel.h diff --git a/Modules/Learning/DimensionalityReduction/include/PCAModel.txx b/Modules/Learning/DimensionalityReductionLearning/include/PCAModel.txx similarity index 100% rename from Modules/Learning/DimensionalityReduction/include/PCAModel.txx rename to Modules/Learning/DimensionalityReductionLearning/include/PCAModel.txx diff --git a/Modules/Learning/DimensionalityReduction/include/PCAModelFactory.h b/Modules/Learning/DimensionalityReductionLearning/include/PCAModelFactory.h similarity index 100% rename from Modules/Learning/DimensionalityReduction/include/PCAModelFactory.h rename to Modules/Learning/DimensionalityReductionLearning/include/PCAModelFactory.h diff --git a/Modules/Learning/DimensionalityReduction/include/PCAModelFactory.txx b/Modules/Learning/DimensionalityReductionLearning/include/PCAModelFactory.txx similarity index 100% rename from Modules/Learning/DimensionalityReduction/include/PCAModelFactory.txx rename to Modules/Learning/DimensionalityReductionLearning/include/PCAModelFactory.txx diff --git a/Modules/Learning/DimensionalityReduction/include/SOMModel.h b/Modules/Learning/DimensionalityReductionLearning/include/SOMModel.h similarity index 100% rename from Modules/Learning/DimensionalityReduction/include/SOMModel.h rename to Modules/Learning/DimensionalityReductionLearning/include/SOMModel.h diff --git a/Modules/Learning/DimensionalityReduction/include/SOMModel.txx b/Modules/Learning/DimensionalityReductionLearning/include/SOMModel.txx similarity index 100% rename from Modules/Learning/DimensionalityReduction/include/SOMModel.txx rename to Modules/Learning/DimensionalityReductionLearning/include/SOMModel.txx diff --git a/Modules/Learning/DimensionalityReduction/include/SOMModelFactory.h b/Modules/Learning/DimensionalityReductionLearning/include/SOMModelFactory.h similarity index 100% rename from Modules/Learning/DimensionalityReduction/include/SOMModelFactory.h rename to Modules/Learning/DimensionalityReductionLearning/include/SOMModelFactory.h diff --git a/Modules/Learning/DimensionalityReduction/include/SOMModelFactory.txx b/Modules/Learning/DimensionalityReductionLearning/include/SOMModelFactory.txx similarity index 100% rename from Modules/Learning/DimensionalityReduction/include/SOMModelFactory.txx rename to Modules/Learning/DimensionalityReductionLearning/include/SOMModelFactory.txx diff --git a/Modules/Learning/DimensionalityReduction/include/cbLearningApplicationBaseDR.h b/Modules/Learning/DimensionalityReductionLearning/include/cbLearningApplicationBaseDR.h similarity index 100% rename from Modules/Learning/DimensionalityReduction/include/cbLearningApplicationBaseDR.h rename to Modules/Learning/DimensionalityReductionLearning/include/cbLearningApplicationBaseDR.h diff --git a/Modules/Learning/DimensionalityReduction/include/cbLearningApplicationBaseDR.txx b/Modules/Learning/DimensionalityReductionLearning/include/cbLearningApplicationBaseDR.txx similarity index 100% rename from Modules/Learning/DimensionalityReduction/include/cbLearningApplicationBaseDR.txx rename to Modules/Learning/DimensionalityReductionLearning/include/cbLearningApplicationBaseDR.txx diff --git a/Modules/Learning/DimensionalityReduction/include/cbTrainAutoencoder.txx b/Modules/Learning/DimensionalityReductionLearning/include/cbTrainAutoencoder.txx similarity index 100% rename from Modules/Learning/DimensionalityReduction/include/cbTrainAutoencoder.txx rename to Modules/Learning/DimensionalityReductionLearning/include/cbTrainAutoencoder.txx diff --git a/Modules/Learning/DimensionalityReduction/include/cbTrainPCA.txx b/Modules/Learning/DimensionalityReductionLearning/include/cbTrainPCA.txx similarity index 100% rename from Modules/Learning/DimensionalityReduction/include/cbTrainPCA.txx rename to Modules/Learning/DimensionalityReductionLearning/include/cbTrainPCA.txx diff --git a/Modules/Learning/DimensionalityReduction/include/cbTrainSOM.txx b/Modules/Learning/DimensionalityReductionLearning/include/cbTrainSOM.txx similarity index 100% rename from Modules/Learning/DimensionalityReduction/include/cbTrainSOM.txx rename to Modules/Learning/DimensionalityReductionLearning/include/cbTrainSOM.txx diff --git a/Modules/Learning/DimensionalityReduction/otb-module.cmake b/Modules/Learning/DimensionalityReductionLearning/otb-module.cmake similarity index 64% rename from Modules/Learning/DimensionalityReduction/otb-module.cmake rename to Modules/Learning/DimensionalityReductionLearning/otb-module.cmake index 258fdf1c44..c700e3ba10 100644 --- a/Modules/Learning/DimensionalityReduction/otb-module.cmake +++ b/Modules/Learning/DimensionalityReductionLearning/otb-module.cmake @@ -1,6 +1,6 @@ set(DOCUMENTATION "Dimensionality reduction application") -otb_module(CbDimensionalityReduction - DEPENDS +otb_module(OTBDimensionalityReductionLearning + DEPENDS OTBCommon OTBApplicationEngine OTBITK @@ -9,6 +9,6 @@ otb_module(CbDimensionalityReduction OTBAppClassification OTBSOM OTBLearningBase - DESCRIPTION - "${DOCUMENTATION}" + DESCRIPTION + "${DOCUMENTATION}" ) -- GitLab