From f015345f9cbdd79f1af5244c328eb6bce9c4fb4c Mon Sep 17 00:00:00 2001
From: Julien Michel <julien.michel@orfeo-toolbox.org>
Date: Mon, 23 Mar 2015 15:14:57 +0100
Subject: [PATCH] ENH: Removing additional tests using the old API
---
.../Learning/SVMLearning/test/CMakeLists.txt | 17 -----------------
.../test/otbSVMLearningTestDriver.cxx | 2 --
.../test/otbSVMSampleListModelEstimatorTest.cxx | 1 -
3 files changed, 20 deletions(-)
diff --git a/Modules/Learning/SVMLearning/test/CMakeLists.txt b/Modules/Learning/SVMLearning/test/CMakeLists.txt
index 0349453c82..a53acb55d5 100644
--- a/Modules/Learning/SVMLearning/test/CMakeLists.txt
+++ b/Modules/Learning/SVMLearning/test/CMakeLists.txt
@@ -4,7 +4,6 @@ set(OTBSVMLearningTests
otbSVMLearningTestDriver.cxx
otbSVMImageClassificationWithRuleFilter.cxx
otbLabelMapSVMClassifier.cxx
-otbSVMModelCopyTest.cxx
otbSVMPointSetModelEstimatorTrain.cxx
otbExhaustiveExponentialOptimizerNew.cxx
otbSVMImageModelEstimatorModelAccessor.cxx
@@ -18,7 +17,6 @@ otbSVMClassifierPointSet.cxx
otbSVMImageClassificationWithRuleFilterNew.cxx
otbSVMImageModelEstimatorTrain.cxx
otbObjectDetectionClassifier.cxx
-otbSVMClassifierImage.cxx
otbSVMClassifierNew.cxx
otbSVMSampleListModelEstimatorTest.cxx
otbSVMModelAccessor.cxx
@@ -52,13 +50,6 @@ otb_add_test(NAME obTvLabelMapSVMClassifier COMMAND otbSVMLearningTestDriver
otb_add_test(NAME obTuLabelMapSVMClassifierNew COMMAND otbSVMLearningTestDriver
otbLabelMapSVMClassifierNew)
-
-otb_add_test(NAME leTvSVMModelCopy COMMAND otbSVMLearningTestDriver
- --compare-ascii ${NOTOL} ${INPUTDATA}/svm_model
- ${TEMP}/svmcopymodel_test
- otbSVMModelCopyTest
- ${INPUTDATA}/svm_model
- ${TEMP}/svmcopymodel_test)
otb_add_test(NAME leTvSVMPointSetModelEstimatorTrain COMMAND otbSVMLearningTestDriver
--compare-ascii ${EPSILON_3} ${BASELINE_FILES}/leTvsvm_model_pointset
@@ -167,14 +158,6 @@ otb_add_test(NAME odTvObjectDetectionClassifier COMMAND otbSVMLearningTestDriver
5 # neighborhood radius
)
-otb_add_test(NAME leTvSVMClassifierImageWithGenericKernalLinear COMMAND otbSVMLearningTestDriver
- --compare-image ${NOTOL} ${BASELINE}/leTvSVMClassifierImageWithGenericKernalLinearOutput.png
- ${TEMP}/leTvSVMClassifierImageWithGenericKernalLinearOutput.png
- otbSVMClassifierImage
- ${INPUTDATA}/ROI_QB_MUL_4.tif
- ${INPUTDATA}/svm_model_image_generic_linear
- ${TEMP}/leTvSVMClassifierImageWithGenericKernalLinearOutput.png)
-
otb_add_test(NAME leTvSVMClassifierImageOneClass COMMAND otbSVMLearningTestDriver
--compare-image ${NOTOL}
${BASELINE}/leSVMClassifierImageOneClassOutput.png
diff --git a/Modules/Learning/SVMLearning/test/otbSVMLearningTestDriver.cxx b/Modules/Learning/SVMLearning/test/otbSVMLearningTestDriver.cxx
index ca5c2dbd47..53632ade9c 100644
--- a/Modules/Learning/SVMLearning/test/otbSVMLearningTestDriver.cxx
+++ b/Modules/Learning/SVMLearning/test/otbSVMLearningTestDriver.cxx
@@ -4,7 +4,6 @@ void RegisterTests()
REGISTER_TEST(otbSVMImageClassificationWithRuleFilter);
REGISTER_TEST(otbLabelMapSVMClassifierNew);
REGISTER_TEST(otbLabelMapSVMClassifier);
- REGISTER_TEST(otbSVMModelCopyTest);
REGISTER_TEST(otbSVMPointSetModelEstimatorTrain);
REGISTER_TEST(otbExhaustiveExponentialOptimizerNew);
REGISTER_TEST(otbSVMImageModelEstimatorModelAccessor);
@@ -19,7 +18,6 @@ void RegisterTests()
REGISTER_TEST(otbSVMImageModelEstimatorTrain);
REGISTER_TEST(otbObjectDetectionClassifierNew);
REGISTER_TEST(otbObjectDetectionClassifier);
- REGISTER_TEST(otbSVMClassifierImage);
REGISTER_TEST(otbSVMClassifierNew);
REGISTER_TEST(otbSVMSampleListModelEstimatorNew);
REGISTER_TEST(otbSVMSampleListModelEstimatorTest);
diff --git a/Modules/Learning/SVMLearning/test/otbSVMSampleListModelEstimatorTest.cxx b/Modules/Learning/SVMLearning/test/otbSVMSampleListModelEstimatorTest.cxx
index 504afc565c..5e5d212597 100644
--- a/Modules/Learning/SVMLearning/test/otbSVMSampleListModelEstimatorTest.cxx
+++ b/Modules/Learning/SVMLearning/test/otbSVMSampleListModelEstimatorTest.cxx
@@ -22,7 +22,6 @@
#include <iostream>
#include "otbSVMSampleListModelEstimator.h"
-#include "otbSVMKernels.h"
#include "otbVectorImage.h"
#include "otbImageFileReader.h"
--
GitLab