diff --git a/Testing/Code/FeatureExtraction/CMakeLists.txt b/Testing/Code/FeatureExtraction/CMakeLists.txt
index 26fa53e0bef8a9d7eab14bca717f621be0ac557f..773eb95a5d18a7ea24b729bd9a6f9958a50ba654 100644
--- a/Testing/Code/FeatureExtraction/CMakeLists.txt
+++ b/Testing/Code/FeatureExtraction/CMakeLists.txt
@@ -28,111 +28,111 @@ SET(FEATUREEXTRACTION_TESTS9 ${CXX_TEST_PATH}/otbFeatureExtractionTests9)
SET(FEATUREEXTRACTION_TESTS10 ${CXX_TEST_PATH}/otbFeatureExtractionTests10)
SET(FEATUREEXTRACTION_TESTS11 ${CXX_TEST_PATH}/otbFeatureExtractionTests11)
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ otbFeatureExtractionTests1 ~~~~~~~~~~~~~~~~~~~~~
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-ADD_TEST(feTvAlignMV2ITK ${FEATUREEXTRACTION_TESTS1}
+ADD_TEST(feTvAlignMV2ITK ${FEATUREEXTRACTION_TESTS1}
--compare-ascii ${EPS} ${BASELINE_FILES}/feAlign.txt
${TEMP}/feAlign.txt
- otbAlignImageToPath
+ otbAlignImageToPath
${INPUTDATA}/poupees.hdr
${TEMP}/feAlign.txt)
# ------- otb::Draw ------------------------------
-
-ADD_TEST(feTvDrawPathTestCarre ${FEATUREEXTRACTION_TESTS1}
+
+ADD_TEST(feTvDrawPathTestCarre ${FEATUREEXTRACTION_TESTS1}
--compare-image ${TOL} ${BASELINE}/feDrawPathDessinCarre.png
${TEMP}/feDrawPathDessinCarre.png
otbDrawPathDessinCarre
${INPUTDATA}/DeuxTraits.png
${TEMP}/feDrawPathDessinCarre.png)
-ADD_TEST(feTvDrawPathTestAlign ${FEATUREEXTRACTION_TESTS1}
+ADD_TEST(feTvDrawPathTestAlign ${FEATUREEXTRACTION_TESTS1}
--compare-image ${TOL} ${BASELINE}/feDrawPathAlignDeuxTraits.png
${TEMP}/feDrawPathAlignDeuxTraits.png
otbDrawPathAlign
${INPUTDATA}/DeuxTraits.png
${TEMP}/feDrawPathAlignDeuxTraits.png)
-
-ADD_TEST(feTuComplexMomentImage ${FEATUREEXTRACTION_TESTS1}
+
+ADD_TEST(feTuComplexMomentImage ${FEATUREEXTRACTION_TESTS1}
otbComplexMomentImage
${INPUTDATA}/TeteAToto.png 1 1)
-ADD_TEST(feTuHuImage ${FEATUREEXTRACTION_TESTS1}
+ADD_TEST(feTuHuImage ${FEATUREEXTRACTION_TESTS1}
otbHuImage
${INPUTDATA}/TeteAToto.png)
-ADD_TEST(feTuFlusserImage ${FEATUREEXTRACTION_TESTS1}
+ADD_TEST(feTuFlusserImage ${FEATUREEXTRACTION_TESTS1}
otbFlusserImage
${INPUTDATA}/TeteAToto.png)
-
-ADD_TEST(feTuComplexMomentPathNew ${FEATUREEXTRACTION_TESTS1}
+
+ADD_TEST(feTuComplexMomentPathNew ${FEATUREEXTRACTION_TESTS1}
otbComplexMomentPathNew)
-
-ADD_TEST(feTuComplexMomentPath ${FEATUREEXTRACTION_TESTS1}
+
+ADD_TEST(feTuComplexMomentPath ${FEATUREEXTRACTION_TESTS1}
otbComplexMomentPath 1 1)
-ADD_TEST(feTuComplexMomentPathFloat ${FEATUREEXTRACTION_TESTS1}
+ADD_TEST(feTuComplexMomentPathFloat ${FEATUREEXTRACTION_TESTS1}
otbComplexMomentPath 1 1)
-ADD_TEST(feTuHuPathNew ${FEATUREEXTRACTION_TESTS1}
+ADD_TEST(feTuHuPathNew ${FEATUREEXTRACTION_TESTS1}
otbHuPathNew)
-ADD_TEST(feTuHuPath ${FEATUREEXTRACTION_TESTS1}
+ADD_TEST(feTuHuPath ${FEATUREEXTRACTION_TESTS1}
otbHuPath)
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ otbFeatureExtractionTests2 ~~~~~~~~~~~~~~~~~~~~~
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-ADD_TEST(feTuFlusserPathNew ${FEATUREEXTRACTION_TESTS2}
+ADD_TEST(feTuFlusserPathNew ${FEATUREEXTRACTION_TESTS2}
otbFlusserPathNew)
-ADD_TEST(feTuFlusserPath ${FEATUREEXTRACTION_TESTS2}
+ADD_TEST(feTuFlusserPath ${FEATUREEXTRACTION_TESTS2}
otbFlusserPath)
-
+
# ------- otb::OrientationPathFunction ------------------------
-
-ADD_TEST(feTuOrientationPathNew ${FEATUREEXTRACTION_TESTS2}
+
+ADD_TEST(feTuOrientationPathNew ${FEATUREEXTRACTION_TESTS2}
otbOrientationPathNew)
-ADD_TEST(feTuOrientationPath_000 ${FEATUREEXTRACTION_TESTS2}
+ADD_TEST(feTuOrientationPath_000 ${FEATUREEXTRACTION_TESTS2}
otbOrientationPath 0.0)
-ADD_TEST(feTuOrientationPath_045 ${FEATUREEXTRACTION_TESTS2}
+ADD_TEST(feTuOrientationPath_045 ${FEATUREEXTRACTION_TESTS2}
otbOrientationPath 45.0)
-ADD_TEST(feTuOrientationPath_090 ${FEATUREEXTRACTION_TESTS2}
+ADD_TEST(feTuOrientationPath_090 ${FEATUREEXTRACTION_TESTS2}
otbOrientationPath 90.0)
-ADD_TEST(feTuOrientationPath1_80 ${FEATUREEXTRACTION_TESTS2}
+ADD_TEST(feTuOrientationPath1_80 ${FEATUREEXTRACTION_TESTS2}
otbOrientationPath 180.0)
# ------- otb::CompacityPathFunction ------------------------
-
-ADD_TEST(feTuCompacityPathNew ${FEATUREEXTRACTION_TESTS2}
+
+ADD_TEST(feTuCompacityPathNew ${FEATUREEXTRACTION_TESTS2}
otbCompacityPathNew)
-ADD_TEST(feTuCompacityPathCircle ${FEATUREEXTRACTION_TESTS2}
+ADD_TEST(feTuCompacityPathCircle ${FEATUREEXTRACTION_TESTS2}
otbCompacityPathCircle 1000)
-ADD_TEST(feTuCompacityPathSquare ${FEATUREEXTRACTION_TESTS2}
+ADD_TEST(feTuCompacityPathSquare ${FEATUREEXTRACTION_TESTS2}
otbCompacityPathSquare 10.0)
-ADD_TEST(feTuCompacityPathRectangle ${FEATUREEXTRACTION_TESTS2}
+ADD_TEST(feTuCompacityPathRectangle ${FEATUREEXTRACTION_TESTS2}
otbCompacityPathRectangle 10.0 20.0)
-
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ otbFeatureExtractionTests3 ~~~~~~~~~~~~~~~~~~~~~
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# ------- otb::TouziEdgeDetector ------------------------------
-ADD_TEST(feTuTouziNew ${FEATUREEXTRACTION_TESTS3}
+ADD_TEST(feTuTouziNew ${FEATUREEXTRACTION_TESTS3}
otbTouziEdgeDetectorNew)
-
+
ADD_TEST(feTvTouzi ${FEATUREEXTRACTION_TESTS3}
--compare-image ${EPSILON} ${BASELINE}/feFiltreTouzi_amst_3.hdr
${TEMP}/feFiltreTouzi_amst_3.hdr
@@ -140,26 +140,26 @@ ADD_TEST(feTvTouzi ${FEATUREEXTRACTION_TESTS3}
${INPUTDATA}/amst.png
${TEMP}/feFiltreTouzi_amst_3.hdr
3)
-
+
ADD_TEST(feTvTouziDir ${FEATUREEXTRACTION_TESTS3}
--compare-image ${EPSILON} ${BASELINE}/feFiltreTouzi_amst_dir_3.hdr
- ${TEMP}/feFiltreTouzi_amst_dir_3.hdr
+ ${TEMP}/feFiltreTouzi_amst_dir_3.hdr
otbTouziEdgeDetectorDirection
${INPUTDATA}/amst.png
${TEMP}/feFiltreTouzi_amst_dir_3.hdr
- 3)
+ 3)
# ------- otb::LineDetectorBase ------------------------------
-ADD_TEST(feTuLineDetectorBaseNew ${FEATUREEXTRACTION_TESTS3}
+ADD_TEST(feTuLineDetectorBaseNew ${FEATUREEXTRACTION_TESTS3}
otbLineDetectorBaseNew)
-
+
# ------- otb::LineCorrelationDetector ------------------------------
-
-ADD_TEST(feTuLineCorrelationNew ${FEATUREEXTRACTION_TESTS3}
+
+ADD_TEST(feTuLineCorrelationNew ${FEATUREEXTRACTION_TESTS3}
otbLineCorrelationDetectorNew)
-
-ADD_TEST(feTvLineCorrelationLinear ${FEATUREEXTRACTION_TESTS3}
+
+ADD_TEST(feTvLineCorrelationLinear ${FEATUREEXTRACTION_TESTS3}
--compare-n-images ${EPSILON} 2
${BASELINE}/feFiltreLineCorrelationLinear_amst_2_3.hdr
${TEMP}/feFiltreLineCorrelationLinear_amst_2_3.hdr
@@ -170,21 +170,21 @@ ADD_TEST(feTvLineCorrelationLinear ${FEATUREEXTRACTION_TESTS3}
${TEMP}/feFiltreLineCorrelationLinear_amst_2_3.hdr
${TEMP}/feFiltreLineCorrelationLinear_amst_dir_2_3.hdr
2 3)
-
-ADD_TEST(feTvLineCorrelation ${FEATUREEXTRACTION_TESTS3}
+
+ADD_TEST(feTvLineCorrelation ${FEATUREEXTRACTION_TESTS3}
--compare-image ${EPSILON} ${BASELINE}/feFiltreLineCorrelation_amst_2_3.hdr
${TEMP}/feFiltreLineCorrelation_amst_2_3.hdr
otbLineCorrelationDetector
${INPUTDATA}/amst.png
${TEMP}/feFiltreLineCorrelation_amst_2_3.hdr
2 3)
-
+
# ------- otb::LineRatioDetector ------------------------------
-ADD_TEST(feTuLineRatioNew ${FEATUREEXTRACTION_TESTS3}
+ADD_TEST(feTuLineRatioNew ${FEATUREEXTRACTION_TESTS3}
otbLineRatioDetectorNew)
-
-ADD_TEST(feTvLineRatioLinear ${FEATUREEXTRACTION_TESTS3}
+
+ADD_TEST(feTvLineRatioLinear ${FEATUREEXTRACTION_TESTS3}
--compare-n-images ${EPSILON} 2
${BASELINE}/feFiltreLineRatioLinear_amst_2_3.hdr
${TEMP}/feFiltreLineRatioLinear_amst_2_3.hdr
@@ -195,8 +195,8 @@ ADD_TEST(feTvLineRatioLinear ${FEATUREEXTRACTION_TESTS3}
${TEMP}/feFiltreLineRatioLinear_amst_2_3.hdr
${TEMP}/feFiltreLineRatioLinear_amst_dir_2_3.hdr
2 3)
-
-ADD_TEST(feTvLineRatioLinearAmsters1 ${FEATUREEXTRACTION_TESTS3}
+
+ADD_TEST(feTvLineRatioLinearAmsters1 ${FEATUREEXTRACTION_TESTS3}
--compare-n-images ${EPSILON} 2
${BASELINE}/feFiltreLineRatioLinear_amst_ers1_ima_extrait.hdr
${TEMP}/feFiltreLineRatioLinear_amst_ers1_ima_extrait.hdr
@@ -207,8 +207,8 @@ ADD_TEST(feTvLineRatioLinearAmsters1 ${FEATUREEXTRACTION_TESTS3}
${TEMP}/feFiltreLineRatioLinear_amst_ers1_ima_extrait.hdr
${TEMP}/feFiltreLineRatioLinear_amst_dir_ers1_ima_extrait.hdr
1 2)
-
-ADD_TEST(feTvLineRatio ${FEATUREEXTRACTION_TESTS3}
+
+ADD_TEST(feTvLineRatio ${FEATUREEXTRACTION_TESTS3}
--compare-image ${EPSILON} ${BASELINE}/feFiltreLineRatio_amst_2_3.hdr
${TEMP}/feFiltreLineRatio_amst_2_3.hdr
otbLineRatioDetector
@@ -217,16 +217,16 @@ ADD_TEST(feTvLineRatio ${FEATUREEXTRACTION_TESTS3}
2 3)
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ otbFeatureExtractionTests4 ~~~~~~~~~~~~~~~~~~~~~
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# ------- otb::AssociativeSymmetricalSum ------------------------------
-
-ADD_TEST(feTuAssociativeSymmetricalSumNew ${FEATUREEXTRACTION_TESTS4}
+
+ADD_TEST(feTuAssociativeSymmetricalSumNew ${FEATUREEXTRACTION_TESTS4}
otbAssociativeSymmetricalSumNew)
-
-ADD_TEST(feTvAssociativeSymmetricalSum ${FEATUREEXTRACTION_TESTS4}
+
+ADD_TEST(feTvAssociativeSymmetricalSum ${FEATUREEXTRACTION_TESTS4}
--compare-image ${EPSILON} ${BASELINE}/feFiltreASS_amst_2_3.hdr
${TEMP}/feFiltreASS_amst_2_3.hdr
otbAssociativeSymmetricalSum
@@ -235,11 +235,11 @@ ADD_TEST(feTvAssociativeSymmetricalSum ${FEATUREEXTRACTION_TESTS4}
${TEMP}/feFiltreASS_amst_2_3.hdr)
# ------- otb::AssymmetricFusionOfLineDetector ------------------------------
-
-ADD_TEST(feTuAssymmetricFusionOfLineDetectorNew ${FEATUREEXTRACTION_TESTS4}
+
+ADD_TEST(feTuAssymmetricFusionOfLineDetectorNew ${FEATUREEXTRACTION_TESTS4}
otbAssymmetricFusionOfLineDetectorNew)
-
-ADD_TEST(feTvAssymmetricFusionOfLineDetector ${FEATUREEXTRACTION_TESTS4}
+
+ADD_TEST(feTvAssymmetricFusionOfLineDetector ${FEATUREEXTRACTION_TESTS4}
--compare-image ${EPSILON} ${BASELINE}/feFiltreAssymmetricFusion_amst_2_3.hdr
${TEMP}/feFiltreAssymmetricFusion_amst_2_3.hdr
otbAssymmetricFusionOfLineDetector
@@ -248,24 +248,24 @@ ADD_TEST(feTvAssymmetricFusionOfLineDetector ${FEATUREEXTRACTION_TESTS4}
2 3)
# ------- otb::HarrisImage ------------------------------
-
-ADD_TEST(feTvHarrisImage ${FEATUREEXTRACTION_TESTS4}
+
+ADD_TEST(feTvHarrisImage ${FEATUREEXTRACTION_TESTS4}
--compare-image ${TOL} ${BASELINE}/feHarrisImage.png
${TEMP}/feHarrisImage.png
- otbHarrisImage
+ otbHarrisImage
${INPUTDATA}/TeteAToto.png
${TEMP}/feHarrisImage.png
1.0 2.0 0.0)
-ADD_TEST(feTvHarrisPoupee ${FEATUREEXTRACTION_TESTS4}
+ADD_TEST(feTvHarrisPoupee ${FEATUREEXTRACTION_TESTS4}
--compare-image ${TOL} ${BASELINE}/feHarris_poupees.png
${TEMP}/feHarris_poupees.png
- otbHarrisImage
+ otbHarrisImage
${INPUTDATA}/poupees_1canal.c1.hdr
${TEMP}/feHarris_poupees.png
1.0 1.0 1.0)
-ADD_TEST(feTvMultiplyByScalarImage ${FEATUREEXTRACTION_TESTS4}
+ADD_TEST(feTvMultiplyByScalarImage ${FEATUREEXTRACTION_TESTS4}
otbMultiplyByScalarImageFilterTest)
ADD_TEST(feTuThresholdImageToPointSetFilterNew ${FEATUREEXTRACTION_TESTS4}
@@ -273,72 +273,72 @@ ADD_TEST(feTuThresholdImageToPointSetFilterNew ${FEATUREEXTRACTION_TESTS4}
)
-ADD_TEST(feTuThresholdImageToPointSet1 ${FEATUREEXTRACTION_TESTS4}
+ADD_TEST(feTuThresholdImageToPointSet1 ${FEATUREEXTRACTION_TESTS4}
--compare-ascii ${EPS} ${BASELINE_FILES}/feThresholdImageToPointSet_Threshold_0To255.txt
${TEMP}/feThresholdImageToPointSet_Threshold_0To255.txt
- otbThresholdImageToPointSetTest
+ otbThresholdImageToPointSetTest
${INPUTDATA}/small_points.hdr
${TEMP}/feThresholdImageToPointSet_Threshold_0To255.txt
0 255 )
-ADD_TEST(feTuThresholdImageToPointSet2 ${FEATUREEXTRACTION_TESTS4}
+ADD_TEST(feTuThresholdImageToPointSet2 ${FEATUREEXTRACTION_TESTS4}
--compare-ascii ${EPS} ${BASELINE_FILES}/feThresholdImageToPointSet_Threshold_0To0.txt
${TEMP}/feThresholdImageToPointSet_Threshold_0To0.txt
- otbThresholdImageToPointSetTest
+ otbThresholdImageToPointSetTest
${INPUTDATA}/small_points.hdr
${TEMP}/feThresholdImageToPointSet_Threshold_0To0.txt
0 0 )
-ADD_TEST(feTuThresholdImageToPointSet3 ${FEATUREEXTRACTION_TESTS4}
+ADD_TEST(feTuThresholdImageToPointSet3 ${FEATUREEXTRACTION_TESTS4}
--compare-ascii ${EPS} ${BASELINE_FILES}/feThresholdImageToPointSet_Threshold_255To255.txt
${TEMP}/feThresholdImageToPointSet_Threshold_255To255.txt
- otbThresholdImageToPointSetTest
+ otbThresholdImageToPointSetTest
${INPUTDATA}/small_points.hdr
${TEMP}/feThresholdImageToPointSet_Threshold_255To255.txt
255 255 )
-ADD_TEST(feTuThresholdImageToPointSet4 ${FEATUREEXTRACTION_TESTS4}
+ADD_TEST(feTuThresholdImageToPointSet4 ${FEATUREEXTRACTION_TESTS4}
--compare-ascii ${EPS} ${BASELINE_FILES}/feThresholdImageToPointSet_Threshold_1To200.txt
${TEMP}/feThresholdImageToPointSet_Threshold_1To200.txt
- otbThresholdImageToPointSetTest
+ otbThresholdImageToPointSetTest
${INPUTDATA}/small_points.hdr
${TEMP}/feThresholdImageToPointSet_Threshold_1To200.txt
1 200 )
-ADD_TEST(feTvHarrisProduceImageToValidHarrisToPointSet ${FEATUREEXTRACTION_TESTS4}
- otbHarrisImage
+ADD_TEST(feTvHarrisProduceImageToValidHarrisToPointSet ${FEATUREEXTRACTION_TESTS4}
+ otbHarrisImage
${INPUTDATA}/small_points.hdr
${TEMP}/small_points_harris.hdr
1.0 1.0 1.0)
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ otbFeatureExtractionTests5 ~~~~~~~~~~~~~~~~~~~~~
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-ADD_TEST(feTvHarrisToPointSet1 ${FEATUREEXTRACTION_TESTS5}
+ADD_TEST(feTvHarrisToPointSet1 ${FEATUREEXTRACTION_TESTS5}
--compare-ascii ${EPS} ${BASELINE_FILES}/feHarrisToPointSet_Threshold_2To255.txt
${TEMP}/feHarrisToPointSet_Threshold_2To255.txt
- otbHarrisToPointSet
+ otbHarrisToPointSet
${INPUTDATA}/small_points.hdr
${TEMP}/feHarrisToPointSet_Threshold_2To255.txt
1.0 1.0 1.0 2.0 255.0)
-ADD_TEST(feTvHarrisToPointSet2 ${FEATUREEXTRACTION_TESTS5}
+ADD_TEST(feTvHarrisToPointSet2 ${FEATUREEXTRACTION_TESTS5}
--compare-ascii ${EPS} ${BASELINE_FILES}/feHarrisToPointSet_Threshold_20To90.txt
${TEMP}/feHarrisToPointSet_Threshold_20To90.txt
- otbHarrisToPointSet
+ otbHarrisToPointSet
${INPUTDATA}/small_points.hdr
${TEMP}/feHarrisToPointSet_Threshold_20To90.txt
1.0 1.0 1.0 20 90)
-ADD_TEST(feTvHarrisToPointSet3 ${FEATUREEXTRACTION_TESTS5}
+ADD_TEST(feTvHarrisToPointSet3 ${FEATUREEXTRACTION_TESTS5}
--compare-ascii ${EPS} ${BASELINE_FILES}/feHarrisToPointSet_Threshold_100To160.txt
${TEMP}/feHarrisToPointSet_Threshold_100To160.txt
- otbHarrisToPointSet
+ otbHarrisToPointSet
${INPUTDATA}/small_points.hdr
${TEMP}/feHarrisToPointSet_Threshold_100To160.txt
1.0 1.0 1.0 100 160)
# ------- otb::PixelSuppressionByDirection ------------------------------
-
-ADD_TEST(feTuPixelSuppressionByDirectionNew ${FEATUREEXTRACTION_TESTS5}
+
+ADD_TEST(feTuPixelSuppressionByDirectionNew ${FEATUREEXTRACTION_TESTS5}
otbPixelSuppressionByDirectionNew)
-
+
ADD_TEST(feTvPixelSuppressionByDirection ${FEATUREEXTRACTION_TESTS5}
--compare-image ${TOL} ${BASELINE}/feFiltrePixelSuppr_ImageLine_2_0_3.hdr
${TEMP}/feFiltrePixelSuppr_ImageLine_2_0_3.hdr
@@ -350,99 +350,99 @@ ADD_TEST(feTvPixelSuppressionByDirection ${FEATUREEXTRACTION_TESTS5}
# ------- otb::LocalHough ------------------------------
-ADD_TEST(feTuLocalHoughNew ${FEATUREEXTRACTION_TESTS5}
+ADD_TEST(feTuLocalHoughNew ${FEATUREEXTRACTION_TESTS5}
otbLocalHoughNew)
-ADD_TEST(feTvLocalHough ${FEATUREEXTRACTION_TESTS5}
+ADD_TEST(feTvLocalHough ${FEATUREEXTRACTION_TESTS5}
--compare-ascii ${EPS} ${BASELINE_FILES}/feTvLocaLHoughLinesDetected.txt
${TEMP}/feTvLocaLHoughLinesDetected.txt
otbLocalHough
${INPUTDATA}/ImageLine.bsq.hdr
${TEMP}/feTvLocaLHoughLinesDetected.txt
- 20 20 1)
+ 20 20 1)
-ADD_TEST(feTvLocalHoughDraw ${FEATUREEXTRACTION_TESTS5}
+ADD_TEST(feTvLocalHoughDraw ${FEATUREEXTRACTION_TESTS5}
--compare-image ${EPSILON} ${BASELINE}/feFiltreLocalHoughDraw_ImageLine_20_20_2.hdr
${TEMP}/feFiltreLocalHoughDraw_ImageLine_20_20_2.hdr
otbLocalHoughDraw
${INPUTDATA}/ImageLine.bsq.hdr
${TEMP}/feFiltreLocalHoughDraw_ImageLine_20_20_2.hdr
- 20 20 1)
+ 20 20 1)
-ADD_TEST(feTvLocalHoughDraw2 ${FEATUREEXTRACTION_TESTS5}
+ADD_TEST(feTvLocalHoughDraw2 ${FEATUREEXTRACTION_TESTS5}
--compare-image ${EPSILON} ${BASELINE}/feFilterLocalHoughDraw_amst_20_20_1.tif
${TEMP}/feFilterLocalHoughDraw_amst_20_20_1.png
otbLocalHoughDraw
${INPUTDATA}/amst.png
${TEMP}/feFilterLocalHoughDraw_amst_20_20_1.png
- 20 20 1)
+ 20 20 1)
-ADD_TEST(feTvLocalHoughDrawBis ${FEATUREEXTRACTION_TESTS5}
+ADD_TEST(feTvLocalHoughDrawBis ${FEATUREEXTRACTION_TESTS5}
--compare-image ${EPSILON} ${BASELINE}/feFiltreLocalHoughDraw_Line_20_10_2.png
${TEMP}/feFiltreLocalHoughDraw_Line_20_10_2.png
otbLocalHoughDraw
${INPUTDATA}/Line.png
${TEMP}/feFiltreLocalHoughDraw_Line_20_10_2.png
- 20 10 2)
-
-# ------- otb::FillGapsFilter ------------------------------
+ 20 10 2)
+
+# ------- otb::FillGapsFilter ------------------------------
-ADD_TEST(feTuFillGapsFilterNew ${FEATUREEXTRACTION_TESTS5}
+ADD_TEST(feTuFillGapsFilterNew ${FEATUREEXTRACTION_TESTS5}
otbFillGapsFilterNew)
-
-ADD_TEST(feTuFillGapsFilter ${FEATUREEXTRACTION_TESTS5}
- --compare-image ${EPSILON}
+
+ADD_TEST(feTuFillGapsFilter ${FEATUREEXTRACTION_TESTS5}
+ --compare-image ${EPSILON}
${BASELINE}/feTvFillGapfilter.png
${TEMP}/feTvFillGapfilter.png
otbFillGapsFilter
${INPUTDATA}/ImageLine.bsq.hdr
${TEMP}/feTvFillGapfilter.png)
-# ------- otb::HoughTransform2DLinesImageTest ------------------------------
+# ------- otb::HoughTransform2DLinesImageTest ------------------------------
-ADD_TEST(feTvHoughTransform2DLinesImage ${FEATUREEXTRACTION_TESTS5}
- --compare-image ${EPSILON}
+ADD_TEST(feTvHoughTransform2DLinesImage ${FEATUREEXTRACTION_TESTS5}
+ --compare-image ${EPSILON}
${BASELINE}/feFilterHoughTransformDraw.tif
${TEMP}/feFilterHoughTransformDraw.tif
otbHoughTransform2DLinesImageTest
${TEMP}/feFilterHoughTransformDraw.tif
- )
+ )
# ------- otb::ImageToModulusAndDirectionImageFilter ------------------------------
# ------- otb::ModulusAndDirectionImageToImageFilter ------------------------------
-ADD_TEST(feTuModulusAndDirectionImageFiltersNew ${FEATUREEXTRACTION_TESTS5}
+ADD_TEST(feTuModulusAndDirectionImageFiltersNew ${FEATUREEXTRACTION_TESTS5}
otbModulusAndDirectionImageFiltersNew)
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ otbFeatureExtractionTests6 ~~~~~~~~~~~~~~~~~~~~~
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
# ------- otb::ExtractSegments ------------------------------
-ADD_TEST(feTuExtractSegmentsNew ${FEATUREEXTRACTION_TESTS6}
+ADD_TEST(feTuExtractSegmentsNew ${FEATUREEXTRACTION_TESTS6}
otbExtractSegmentsNew)
-
-ADD_TEST(feTvExtractSegments ${FEATUREEXTRACTION_TESTS6}
+
+ADD_TEST(feTvExtractSegments ${FEATUREEXTRACTION_TESTS6}
--compare-image ${TOL} ${BASELINE}/feFiltreExtractSegments_ImageLine.hdr
${TEMP}/feFiltreExtractSegments_ImageLine.hdr
otbExtractSegments
${INPUTDATA}/ImageLine_hd.bsq.hdr
${INPUTDATA}/ImageLineDir.bsq.hdr
${TEMP}/feFiltreExtractSegments_ImageLine.hdr
- 2 0.3 20 20 2 10 0.5)
+ 2 0.3 20 20 2 10 0.5)
# ------- otb::ForwardFourierMellinTransformImageFilter -------------
-#ADD_TEST(feTuForwardFourierMellinImageFilterNew ${FEATUREEXTRACTION_TESTS6}
-# otbFourierMellinImageFilterNew)
+#ADD_TEST(feTuForwardFourierMellinImageFilterNew ${FEATUREEXTRACTION_TESTS6}
+# otbFourierMellinImageFilterNew)
-#ADD_TEST(feTuForwardFourierMellinImageFilterCroix ${FEATUREEXTRACTION_TESTS6}
-# --compare-n-images ${TOL} 2
+#ADD_TEST(feTuForwardFourierMellinImageFilterCroix ${FEATUREEXTRACTION_TESTS6}
+# --compare-n-images ${TOL} 2
# ${BASELINE}/feFourierMellinCroixOutputModulus.hdr
# ${TEMP}/feFourierMellinCroixOutputModulus.hdr
# ${BASELINE}/feFourierMellinCroixOutputPhase.hdr
@@ -453,8 +453,8 @@ ADD_TEST(feTvExtractSegments ${FEATUREEXTRACTION_TESTS6}
# ${TEMP}/feFourierMellinCroixOutputPhase.hdr
#)
-#ADD_TEST(feTuForwardFourierMellinImageFilter3Croix ${FEATUREEXTRACTION_TESTS6}
-# --compare-n-images ${TOL} 2
+#ADD_TEST(feTuForwardFourierMellinImageFilter3Croix ${FEATUREEXTRACTION_TESTS6}
+# --compare-n-images ${TOL} 2
# ${BASELINE}/feFourierMellin3CroixOutputModulus.hdr
# ${TEMP}/feFourierMellin3CroixOutputModulus.hdr
# ${BASELINE}/feFourierMellin3CroixOutputPhase.hdr
@@ -465,8 +465,8 @@ ADD_TEST(feTvExtractSegments ${FEATUREEXTRACTION_TESTS6}
# ${TEMP}/feFourierMellin3CroixOutputPhase.hdr
#)
-ADD_TEST(feTvForwardFourierMellinImageFilter ${FEATUREEXTRACTION_TESTS6}
- --compare-n-images ${EPSILON} 2
+ADD_TEST(feTvForwardFourierMellinImageFilter ${FEATUREEXTRACTION_TESTS6}
+ --compare-n-images ${EPSILON} 2
${BASELINE}/feForwardFourierMellinImageFilterReal.hdr
${TEMP}/feForwardFourierMellinImageFilterReal.hdr
${BASELINE}/feForwardFourierMellinImageFilterImag.hdr
@@ -479,10 +479,10 @@ ADD_TEST(feTvForwardFourierMellinImageFilter ${FEATUREEXTRACTION_TESTS6}
# -----------------------------------------------------------------------
# ------- otb::ImageToEdgePathFilter -------------
-ADD_TEST(feTuImageToEdgePathFilterNew ${FEATUREEXTRACTION_TESTS6}
- otbImageToEdgePathFilterNew)
+ADD_TEST(feTuImageToEdgePathFilterNew ${FEATUREEXTRACTION_TESTS6}
+ otbImageToEdgePathFilterNew)
-ADD_TEST(feTvImageToEdgePathFilter ${FEATUREEXTRACTION_TESTS6}
+ADD_TEST(feTvImageToEdgePathFilter ${FEATUREEXTRACTION_TESTS6}
--compare-image ${EPSILON}
${BASELINE}/feImageToEdgePathFilter_rcc8_mire4.png
${TEMP}/feImageToEdgePathFilter_rcc8_mire4.png
@@ -491,7 +491,7 @@ ADD_TEST(feTvImageToEdgePathFilter ${FEATUREEXTRACTION_TESTS6}
${TEMP}/feImageToEdgePathFilter_rcc8_mire4.png
255
)
-ADD_TEST(feTvImageToEdgePathFilterBis ${FEATUREEXTRACTION_TESTS6}
+ADD_TEST(feTvImageToEdgePathFilterBis ${FEATUREEXTRACTION_TESTS6}
--compare-image ${EPSILON}
${BASELINE}/feImageToEdgePathFilter_maskrom.png
${TEMP}/feImageToEdgePathFilter_maskrom.png
@@ -503,10 +503,10 @@ ADD_TEST(feTvImageToEdgePathFilterBis ${FEATUREEXTRACTION_TESTS6}
# ------- otb::NeighborhoodScalarProductFilter -------------
-ADD_TEST(feTuNeighborhoodScalarProductFilterNew ${FEATUREEXTRACTION_TESTS6}
- otbNeighborhoodScalarProductFilterNew)
+ADD_TEST(feTuNeighborhoodScalarProductFilterNew ${FEATUREEXTRACTION_TESTS6}
+ otbNeighborhoodScalarProductFilterNew)
-ADD_TEST(feTvNeighborhoodScalarProductFilter ${FEATUREEXTRACTION_TESTS6}
+ADD_TEST(feTvNeighborhoodScalarProductFilter ${FEATUREEXTRACTION_TESTS6}
--compare-n-images ${EPSILON} 2
${BASELINE}/feTvNeigborhoodScalarProductModulusOutput.hdr
${TEMP}/feTvNeigborhoodScalarProductModulusOutput.hdr
@@ -519,16 +519,16 @@ ADD_TEST(feTvNeighborhoodScalarProductFilter ${FEATUREEXTRACTION_TESTS6}
1.0
)
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ otbFeatureExtractionTests7 ~~~~~~~~~~~~~~~~~~~~~
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# ------- otb::RemoveIsolatedByDirectionFilter -------------
-ADD_TEST(feTuRemoveIsolatedByDirectionFilterNew ${FEATUREEXTRACTION_TESTS7}
- otbRemoveIsolatedByDirectionFilterNew)
+ADD_TEST(feTuRemoveIsolatedByDirectionFilterNew ${FEATUREEXTRACTION_TESTS7}
+ otbRemoveIsolatedByDirectionFilterNew)
-ADD_TEST(feTvRemoveIsolatedByDirectionFilter ${FEATUREEXTRACTION_TESTS7}
+ADD_TEST(feTvRemoveIsolatedByDirectionFilter ${FEATUREEXTRACTION_TESTS7}
--compare-image ${EPSILON}
${BASELINE}/feTvRemoveIsolatedByDirectionOutput.hdr
${TEMP}/feTvRemoveIsolatedByDirectionOutput.hdr
@@ -540,10 +540,10 @@ ADD_TEST(feTvRemoveIsolatedByDirectionFilter ${FEATUREEXTRACTION_TESTS7}
# ------- otb::RemoveWrongDirectionFilter -------------
-ADD_TEST(feTuRemoveWrongDirectionFilterNew ${FEATUREEXTRACTION_TESTS7}
- otbRemoveWrongDirectionFilterNew)
+ADD_TEST(feTuRemoveWrongDirectionFilterNew ${FEATUREEXTRACTION_TESTS7}
+ otbRemoveWrongDirectionFilterNew)
-ADD_TEST(feTvRemoveWrongDirectionFilter ${FEATUREEXTRACTION_TESTS7}
+ADD_TEST(feTvRemoveWrongDirectionFilter ${FEATUREEXTRACTION_TESTS7}
--compare-image ${EPSILON}
${BASELINE}/feTvRemoveWrongDirectionOutput.hdr
${TEMP}/feTvRemoveWrongDirectionOutput.hdr
@@ -555,10 +555,10 @@ ADD_TEST(feTvRemoveWrongDirectionFilter ${FEATUREEXTRACTION_TESTS7}
# ------- otb::NonMaxRemovalByDirectionFilter -------------
-ADD_TEST(feTuNonMaxRemovalByDirectionFilterNew ${FEATUREEXTRACTION_TESTS7}
- otbNonMaxRemovalByDirectionFilterNew)
+ADD_TEST(feTuNonMaxRemovalByDirectionFilterNew ${FEATUREEXTRACTION_TESTS7}
+ otbNonMaxRemovalByDirectionFilterNew)
-ADD_TEST(feTvNonMaxRemovalByDirectionFilter ${FEATUREEXTRACTION_TESTS7}
+ADD_TEST(feTvNonMaxRemovalByDirectionFilter ${FEATUREEXTRACTION_TESTS7}
--compare-image ${EPSILON}
${BASELINE}/feTvNonMaxRemovalByDirectionOutput.hdr
${TEMP}/feTvNonMaxRemovalByDirectionOutput.hdr
@@ -570,11 +570,11 @@ ADD_TEST(feTvNonMaxRemovalByDirectionFilter ${FEATUREEXTRACTION_TESTS7}
# ------- otb::VectorizationPathListFilter -------------
-ADD_TEST(feTuVectorizationPathListFilterNew ${FEATUREEXTRACTION_TESTS7}
- otbVectorizationPathListFilterNew)
+ADD_TEST(feTuVectorizationPathListFilterNew ${FEATUREEXTRACTION_TESTS7}
+ otbVectorizationPathListFilterNew)
-ADD_TEST(feTvVectorizationPathListFilterAsciiOutput ${FEATUREEXTRACTION_TESTS7}
---compare-ascii ${EPS}
+ADD_TEST(feTvVectorizationPathListFilterAsciiOutput ${FEATUREEXTRACTION_TESTS7}
+--compare-ascii ${EPS}
${BASELINE_FILES}/feTvVectorizationPathListOutput.txt
${TEMP}/feTvVectorizationPathListOutput.txt
otbVectorizationPathListFilter
@@ -585,7 +585,7 @@ ADD_TEST(feTvVectorizationPathListFilterAsciiOutput ${FEATUREEXTRACTION_TESTS7}
0.0005
)
-ADD_TEST(feTvVectorizationPathListFilterImageOutput ${FEATUREEXTRACTION_TESTS7}
+ADD_TEST(feTvVectorizationPathListFilterImageOutput ${FEATUREEXTRACTION_TESTS7}
--compare-image ${EPSILON}
${BASELINE}/feTvVectorizationPathListOutput.png
${TEMP}/feTvVectorizationPathListOutput.png
@@ -599,11 +599,11 @@ ADD_TEST(feTvVectorizationPathListFilterImageOutput ${FEATUREEXTRACTION_TESTS7}
# ------- otb::SimplifyPathFilter -------------
-ADD_TEST(feTuSimplifyPathListFilterNew ${FEATUREEXTRACTION_TESTS7}
- otbSimplifyPathListFilterNew)
+ADD_TEST(feTuSimplifyPathListFilterNew ${FEATUREEXTRACTION_TESTS7}
+ otbSimplifyPathListFilterNew)
-ADD_TEST(feTvSimplifyPathListFilter ${FEATUREEXTRACTION_TESTS7}
---compare-ascii ${EPS}
+ADD_TEST(feTvSimplifyPathListFilter ${FEATUREEXTRACTION_TESTS7}
+--compare-ascii ${EPS}
${BASELINE_FILES}/feTvSimplifyPathOutput.txt
${TEMP}/feTvSimplifyPathOutput.txt
otbSimplifyPathListFilter
@@ -617,10 +617,10 @@ ADD_TEST(feTvSimplifyPathListFilter ${FEATUREEXTRACTION_TESTS7}
# ------- otb::BreakAngularPathListFilter -------------
-ADD_TEST(feTuBreakAngularPathListFilterNew ${FEATUREEXTRACTION_TESTS7}
- otbBreakAngularPathListFilterNew)
+ADD_TEST(feTuBreakAngularPathListFilterNew ${FEATUREEXTRACTION_TESTS7}
+ otbBreakAngularPathListFilterNew)
-ADD_TEST(feTvBreakAngularPathListFilter ${FEATUREEXTRACTION_TESTS7}
+ADD_TEST(feTvBreakAngularPathListFilter ${FEATUREEXTRACTION_TESTS7}
--compare-ascii ${TOL} ${BASELINE_FILES}/feBreakAngularPathListOutput.txt
${TEMP}/feBreakAngularPathListOutput.txt
otbBreakAngularPathListFilter
@@ -633,26 +633,26 @@ ADD_TEST(feTvBreakAngularPathListFilter ${FEATUREEXTRACTION_TESTS7}
1 11 5 11 7 11 11 11 21 1 31 1 41 1 |
1 1 5 1 7 1 11 1 21 11 31 21 41 31 |
1 1 5 1 5 11 5 21 |
- 1 1 31 1 41 1
- )
+ 1 1 31 1 41 1
+ )
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ otbFeatureExtractionTests8 ~~~~~~~~~~~~~~~~~~~~~
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# ------- otb::RemoveTortuousPathListFilter -------------
-ADD_TEST(feTuRemoveTortuousPathListFilterNew ${FEATUREEXTRACTION_TESTS8}
- otbRemoveTortuousPathListFilterNew)
+ADD_TEST(feTuRemoveTortuousPathListFilterNew ${FEATUREEXTRACTION_TESTS8}
+ otbRemoveTortuousPathListFilterNew)
-ADD_TEST(feTvRemoveTortuousPathListFilter ${FEATUREEXTRACTION_TESTS8}
---compare-ascii ${EPS}
+ADD_TEST(feTvRemoveTortuousPathListFilter ${FEATUREEXTRACTION_TESTS8}
+--compare-ascii ${EPS}
${BASELINE_FILES}/feTvRemoveTortuousPathOutput.txt
${TEMP}/feTvRemoveTortuousPathOutput.txt
otbRemoveTortuousPathListFilter
${TEMP}/feTvRemoveTortuousPathOutput.txt
10.0
- 1 1 1 11 |
+ 1 1 1 11 |
1 1 5 1 7 1 11 1 |
1 1 7 7 21 21 31 31 41 41 |
1 1 5 1 7 1 11 1 21 11 31 11 41 11 58 11 70 11
@@ -660,12 +660,12 @@ ADD_TEST(feTvRemoveTortuousPathListFilter ${FEATUREEXTRACTION_TESTS8}
# ------- otb::LinkPathListFilter -------------
-ADD_TEST(feTuLinkPathListFilterNew ${FEATUREEXTRACTION_TESTS8}
- otbLinkPathListFilterNew)
+ADD_TEST(feTuLinkPathListFilterNew ${FEATUREEXTRACTION_TESTS8}
+ otbLinkPathListFilterNew)
-ADD_TEST(feTvLinkPathListFilter ${FEATUREEXTRACTION_TESTS8}
---compare-ascii ${EPS}
+ADD_TEST(feTvLinkPathListFilter ${FEATUREEXTRACTION_TESTS8}
+--compare-ascii ${EPS}
${BASELINE_FILES}/feTvLinkPathOutput.txt
${TEMP}/feTvLinkPathOutput.txt
otbLinkPathListFilter
@@ -682,16 +682,16 @@ ADD_TEST(feTvLinkPathListFilter ${FEATUREEXTRACTION_TESTS8}
111 71 141 71 |
181 71 151 71 |
11 131 11 101 |
- 11 171 11 141
+ 11 171 11 141
)
# ------- otb::LikelihoodPathListFilter -------------
-ADD_TEST(feTuLikelihoodPathListFilterNew ${FEATUREEXTRACTION_TESTS8}
- otbLikelihoodPathListFilterNew)
+ADD_TEST(feTuLikelihoodPathListFilterNew ${FEATUREEXTRACTION_TESTS8}
+ otbLikelihoodPathListFilterNew)
-ADD_TEST(feTvLikelihoodPathListFilter ${FEATUREEXTRACTION_TESTS8}
---compare-ascii ${EPS}
+ADD_TEST(feTvLikelihoodPathListFilter ${FEATUREEXTRACTION_TESTS8}
+--compare-ascii ${EPS}
${BASELINE_FILES}/feTvLikelihoodPathOutput.txt
${TEMP}/feTvLikelihoodPathOutput.txt
otbLikelihoodPathListFilter
@@ -699,24 +699,24 @@ ADD_TEST(feTvLikelihoodPathListFilter ${FEATUREEXTRACTION_TESTS8}
${TEMP}/feTvLikelihoodPathOutput.txt
157 335 204 376 |
21 305 35 308 77 354 85 358 |
- 73 160 126 173
+ 73 160 126 173
)
# ------- otb::ParallelLinePathListFilter -------------
-ADD_TEST(feTuParallelLinePathListFilterNew ${FEATUREEXTRACTION_TESTS8}
+ADD_TEST(feTuParallelLinePathListFilterNew ${FEATUREEXTRACTION_TESTS8}
otbParallelLinePathListFilterNew)
-ADD_TEST(feTvParallelLinePathListFilter ${FEATUREEXTRACTION_TESTS8}
- otbParallelLinePathListFilter)
-
+ADD_TEST(feTvParallelLinePathListFilter ${FEATUREEXTRACTION_TESTS8}
+ otbParallelLinePathListFilter)
+
# ------- otb::RoadExtractionFilter -------------
-ADD_TEST(feTuRoadExtractionFilterNew ${FEATUREEXTRACTION_TESTS8}
- otbRoadExtractionFilterNew)
+ADD_TEST(feTuRoadExtractionFilterNew ${FEATUREEXTRACTION_TESTS8}
+ otbRoadExtractionFilterNew)
-ADD_TEST(feTvRoadExtractionFilter ${FEATUREEXTRACTION_TESTS8}
+ADD_TEST(feTvRoadExtractionFilter ${FEATUREEXTRACTION_TESTS8}
--compare-image ${EPSILON}
${BASELINE}/feTvOutputRoadDetection.hdr
${TEMP}/feTvOutputRoadDetection.hdr
@@ -728,33 +728,33 @@ ADD_TEST(feTvRoadExtractionFilter ${FEATUREEXTRACTION_TESTS8}
0.00005 # AmplitudeThreshold
1.0 # Tolerance
22.5 # (degre) MaxAngle (3.14159265358979323846/8.)
- 1.0 # FirstMeanDistanceThreshold
- 10.0 # SecondMeanDistanceThreshold
+ 1.0 # FirstMeanDistanceThreshold
+ 10.0 # SecondMeanDistanceThreshold
25. # DistanceThreshold for LinkPathFiler
22.5 # AngularThreshold for LinkPathFiler
- )
+ )
# ------- otb::AddCarvingPathFilter -------------
-ADD_TEST(feTuAddCarvingPathFilterNew ${FEATUREEXTRACTION_TESTS8}
- otbAddCarvingPathFilterNew)
-
+ADD_TEST(feTuAddCarvingPathFilterNew ${FEATUREEXTRACTION_TESTS8}
+ otbAddCarvingPathFilterNew)
+
# ------- otb::RemoveCarvingPathFilter -------------
-ADD_TEST(feTuRemoveCarvingPathFilterNew ${FEATUREEXTRACTION_TESTS8}
- otbRemoveCarvingPathFilterNew)
+ADD_TEST(feTuRemoveCarvingPathFilterNew ${FEATUREEXTRACTION_TESTS8}
+ otbRemoveCarvingPathFilterNew)
# ------- otb::ImageToCarvingPathFilter -------------
-ADD_TEST(feTuImageToCarvingPathFilterNew ${FEATUREEXTRACTION_TESTS8}
- otbImageToCarvingPathFilterNew)
-
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ADD_TEST(feTuImageToCarvingPathFilterNew ${FEATUREEXTRACTION_TESTS8}
+ otbImageToCarvingPathFilterNew)
+
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ otbFeatureExtractionTest9 ~~~~~~~~~~~~~~~~~~~~~~
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# ------- otb::ImageToSIFTKeyPointSetFilter -------------
-ADD_TEST(feTuImageToSIFTKeyPointSetFilterNew ${FEATUREEXTRACTION_TESTS9}
+ADD_TEST(feTuImageToSIFTKeyPointSetFilterNew ${FEATUREEXTRACTION_TESTS9}
otbImageToSIFTKeyPointSetFilterNew)
@@ -766,7 +766,7 @@ ADD_TEST(feTvImageToSIFTKeyPointSetFilterSceneOutputInterestPointAscii ${FEATURE
otbImageToSIFTKeyPointSetFilterOutputInterestPointAscii
${INPUTDATA}/scene.png
${TEMP}/feTvImageToSIFTKeyPointSetFilterSceneKeysOutputInterestPoint.txt
- 6 3 0.08 10.0
+ 6 3 0.08 10.0
)
ADD_TEST(feTvImageToSIFTKeyPointSetFilterSceneDescriptorAscii ${FEATUREEXTRACTION_TESTS9}
@@ -776,7 +776,7 @@ ADD_TEST(feTvImageToSIFTKeyPointSetFilterSceneDescriptorAscii ${FEATUREEXTRACTIO
otbImageToSIFTKeyPointSetFilterOutputDescriptorAscii
${INPUTDATA}/scene.png
${TEMP}/feTvImageToSIFTKeyPointSetFilterSceneKeysOutputDescriptor.txt
- 6 3 0.08 10.0
+ 6 3 0.08 10.0
)
ADD_TEST(feTvImageToSIFTKeyPointSetFilterSquareOutputImage ${FEATUREEXTRACTION_TESTS9}
@@ -786,7 +786,7 @@ ADD_TEST(feTvImageToSIFTKeyPointSetFilterSquareOutputImage ${FEATUREEXTRACTION_T
otbImageToSIFTKeyPointSetFilterOutputImage
${INPUTDATA}/carre.png
${TEMP}/feTvImageToSIFTKeyPointSetFilterSquareImageOutput.png
- 7 3 0.01 10.0
+ 7 3 0.01 10.0
)
ADD_TEST(feTvImageToSIFTKeyPointSetFilterSquareOutputAscii ${FEATUREEXTRACTION_TESTS9}
@@ -796,7 +796,7 @@ ADD_TEST(feTvImageToSIFTKeyPointSetFilterSquareOutputAscii ${FEATUREEXTRACTION_T
otbImageToSIFTKeyPointSetFilterOutputAscii
${INPUTDATA}/carre.png
${TEMP}/feTvImageToSIFTKeyPointSetFilterSquareKeysOutput.txt
- 7 3 0.01 10.0
+ 7 3 0.01 10.0
)
ADD_TEST(feTvImageToSIFTKeyPointSetFilterSquareRotatedOutputAscii ${FEATUREEXTRACTION_TESTS9}
@@ -816,7 +816,7 @@ ADD_TEST(feTvImageToSIFTKeyPointSetFilterGridOutputImage ${FEATUREEXTRACTION_TES
otbImageToSIFTKeyPointSetFilterOutputImage
${INPUTDATA}/damier.png
${TEMP}/feTvImageToSIFTKeyPointSetFilterGridImageOutput.png
- 7 3 0.01 10.0
+ 7 3 0.01 10.0
)
ADD_TEST(feTvImageToSIFTKeyPointSetFilterGridOutputAscii ${FEATUREEXTRACTION_TESTS9}
@@ -826,7 +826,7 @@ ADD_TEST(feTvImageToSIFTKeyPointSetFilterGridOutputAscii ${FEATUREEXTRACTION_TES
otbImageToSIFTKeyPointSetFilterOutputAscii
${INPUTDATA}/damier.png
${TEMP}/feTvImageToSIFTKeyPointSetFilterGridKeysOutput.txt
- 7 3 0.01 10.0
+ 7 3 0.01 10.0
)
ADD_TEST(feTvImageToSIFTKeyPointSetFilterSquare2OutputAscii ${FEATUREEXTRACTION_TESTS9}
@@ -836,7 +836,7 @@ ADD_TEST(feTvImageToSIFTKeyPointSetFilterSquare2OutputAscii ${FEATUREEXTRACTION_
otbImageToSIFTKeyPointSetFilterOutputAscii
${INPUTDATA}/carre.png
${TEMP}/feTvImageToSIFTKeyPointSetFilterSquareKeysOutput2.txt
- 1 3 0.5 10.0
+ 1 3 0.5 10.0
)
ADD_TEST(feTvImageToSIFTKeyPointSetFilterSquareRotated2OutputAscii ${FEATUREEXTRACTION_TESTS9}
@@ -861,11 +861,11 @@ ADD_TEST(feTvImageToSIFTKeyPointSetFilterQB_SuburbOutputAscii ${FEATUREEXTRACTIO
# ------- otb::HessianToHessianDeterminantImageFilter -------------
-ADD_TEST(feTuImageToHessianDeterminantImageFilterNew ${FEATUREEXTRACTION_TESTS9}
+ADD_TEST(feTuImageToHessianDeterminantImageFilterNew ${FEATUREEXTRACTION_TESTS9}
otbImageToHessianDeterminantImageFilterNew)
-ADD_TEST(feTvImageToHessianDeterminantImageFilter ${FEATUREEXTRACTION_TESTS9}
+ADD_TEST(feTvImageToHessianDeterminantImageFilter ${FEATUREEXTRACTION_TESTS9}
--compare-image ${EPS}
${BASELINE}/feTvImageToHessianDeterminantImageFilterOutput.tif
${TEMP}/feTvImageToHessianDeterminantImageFilterOutput.tif
@@ -877,7 +877,7 @@ ADD_TEST(feTvImageToHessianDeterminantImageFilter ${FEATUREEXTRACTION_TESTS9}
# ------- otb::ImageFittingPolygonListFilter -------------
-ADD_TEST(feTuImageFittingPolygonListFilterNew ${FEATUREEXTRACTION_TESTS9}
+ADD_TEST(feTuImageFittingPolygonListFilterNew ${FEATUREEXTRACTION_TESTS9}
otbImageFittingPolygonListFilterNew)
ADD_TEST(feTvImageFittingPolygonListFilter ${FEATUREEXTRACTION_TESTS9}
@@ -893,17 +893,17 @@ ADD_TEST(feTvImageFittingPolygonListFilter ${FEATUREEXTRACTION_TESTS9}
#--------- SimpleCountStrategy --------------
-ADD_TEST(otbSimplePointCountStrategyTest ${FEATUREEXTRACTION_TESTS9}
+ADD_TEST(otbSimplePointCountStrategyTest ${FEATUREEXTRACTION_TESTS9}
otbSimplePointCountStrategyTest)
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ otbFeatureExtractionTests10 ~~~~~~~~~~~~~~~~~~~~~
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# ------- otb::ImageToSURFKeyPointSetFilterNew -------------
-ADD_TEST(feTuImageToSURFKeyPointSetFilterNew ${FEATUREEXTRACTION_TESTS10}
+ADD_TEST(feTuImageToSURFKeyPointSetFilterNew ${FEATUREEXTRACTION_TESTS10}
otbImageToSURFKeyPointSetFilterNew)
@@ -914,7 +914,7 @@ ADD_TEST(feTvImageToSURFKeyPointSetFilterSceneOutputInterestPointAscii ${FEATURE
otbImageToSURFKeyPointSetFilterOutputInterestPointAscii
${INPUTDATA}/scene.png
${TEMP}/feTvImageToSURFKeyPointSetFilterSceneKeysOutputInterestPoint.txt
- 1 3
+ 1 3
)
ADD_TEST(feTvImageToSURFKeyPointSetFilterSceneOutputDescriptorAscii ${FEATUREEXTRACTION_TESTS10}
@@ -924,14 +924,14 @@ ADD_TEST(feTvImageToSURFKeyPointSetFilterSceneOutputDescriptorAscii ${FEATUREEXT
otbImageToSURFKeyPointSetFilterOutputDescriptorAscii
${INPUTDATA}/scene.png
${TEMP}/feTvImageToSURFKeyPointSetFilterSceneKeysOutputDescriptor.txt
- 1 3
+ 1 3
)
-
+
# ------- otb::ImageToFastSIFTKeyPointSetFilter -------------
-ADD_TEST(feTuImageToFastSIFTKeyPointSetFilterNew ${FEATUREEXTRACTION_TESTS10}
+ADD_TEST(feTuImageToFastSIFTKeyPointSetFilterNew ${FEATUREEXTRACTION_TESTS10}
otbImageToFastSIFTKeyPointSetFilterNew)
ADD_TEST(feTvImageToFastSIFTKeyPointSetFilterSceneOutputDescriptorAscii ${FEATUREEXTRACTION_TESTS10}
@@ -939,9 +939,9 @@ ADD_TEST(feTvImageToFastSIFTKeyPointSetFilterSceneOutputDescriptorAscii ${FEATUR
${BASELINE_FILES}/feTvImageToFastSIFTKeyPointSetFilterSceneKeysOutputDescriptor.txt
${TEMP}/feTvImageToFastSIFTKeyPointSetFilterSceneKeysOutputDescriptor.txt
otbImageToFastSIFTKeyPointSetFilterOutputDescriptorAscii
- ${INPUTDATA}/ROI_IKO_PAN_LesHalles_sub.tif
+ ${INPUTDATA}/ROI_IKO_PAN_LesHalles_sub.tif
${TEMP}/feTvImageToFastSIFTKeyPointSetFilterSceneKeysOutputDescriptor.txt
- 6
+ 6
)
ADD_TEST(feTvImageToFastSIFTKeyPointSetFilterSceneOutputInterestPointAscii ${FEATUREEXTRACTION_TESTS10}
@@ -951,40 +951,40 @@ ADD_TEST(feTvImageToFastSIFTKeyPointSetFilterSceneOutputInterestPointAscii ${FEA
otbImageToFastSIFTKeyPointSetFilterOutputInterestPointAscii
${INPUTDATA}/ROI_IKO_PAN_LesHalles_sub.tif
${TEMP}/feTvImageToFastSIFTKeyPointSetFilterSceneKeysOutputInterestPoint.txt
- 6
+ 6
)
# --------- MatchingFilter ----------------
-ADD_TEST(feTuKeyPointSetsMatchingFilterNew ${FEATUREEXTRACTION_TESTS10}
+ADD_TEST(feTuKeyPointSetsMatchingFilterNew ${FEATUREEXTRACTION_TESTS10}
otbKeyPointSetsMatchingFilterNew)
ADD_TEST(feTvKeyPointSetsMatchingFilter ${FEATUREEXTRACTION_TESTS10}
---compare-ascii ${EPS}
+--compare-ascii ${EPS}
${BASELINE}/feTvKeyPointSetsMatchingFilterOutputAscii.txt
- ${TEMP}/feTvKeyPointSetsMatchingFilterOutputAscii.txt
+ ${TEMP}/feTvKeyPointSetsMatchingFilterOutputAscii.txt
otbKeyPointSetsMatchingFilter
${TEMP}/feTvKeyPointSetsMatchingFilterOutputAscii.txt
0.6 0
)
-
+
#--------- LandMark
-ADD_TEST(feTuLandmarkNew ${FEATUREEXTRACTION_TESTS10}
+ADD_TEST(feTuLandmarkNew ${FEATUREEXTRACTION_TESTS10}
otbLandmarkNew)
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ otbFeatureExtractionTests11 ~~~~~~~~~~~~~~~~~~~~~
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# ------- otb::CloudEstimatorFilterNew -------------
-ADD_TEST(feTuCloudEstimatorFilterNew ${FEATUREEXTRACTION_TESTS11}
+ADD_TEST(feTuCloudEstimatorFilterNew ${FEATUREEXTRACTION_TESTS11}
otbCloudEstimatorFilterNew)
-ADD_TEST(feTvCloudEstimatorDefaultFilter ${FEATUREEXTRACTION_TESTS11}
+ADD_TEST(feTvCloudEstimatorDefaultFilter ${FEATUREEXTRACTION_TESTS11}
--compare-image ${EPS}
${BASELINE}/feTvSpectralAngleOutput.tif
${TEMP}/feTvSpectralAngleOutput.tif
@@ -997,7 +997,7 @@ ADD_TEST(feTvCloudEstimatorDefaultFilter ${FEATUREEXTRACTION_TESTS11}
632
)
-ADD_TEST(feTvCloudEstimatorFilter ${FEATUREEXTRACTION_TESTS11}
+ADD_TEST(feTvCloudEstimatorFilter ${FEATUREEXTRACTION_TESTS11}
--compare-image ${EPS}
${BASELINE}/feTvCloudEstimatorOutput.tif
${TEMP}/feTvCloudEstimatorOutput.tif
@@ -1013,7 +1013,7 @@ ADD_TEST(feTvCloudEstimatorFilter ${FEATUREEXTRACTION_TESTS11}
# ------- otb::CloudDetectionFilterNew -------------
-# ADD_TEST(feTvCloudEstimatorFilter ${FEATUREEXTRACTION_TESTS11}
+# ADD_TEST(feTvCloudEstimatorFilter ${FEATUREEXTRACTION_TESTS11}
# --compare-image ${EPS}
# ${BASELINE}/feTvCloudDetectionOutput.tif
# ${TEMP}/feTvCloudDetectionOutput.tif
@@ -1029,6 +1029,13 @@ ADD_TEST(feTvCloudEstimatorFilter ${FEATUREEXTRACTION_TESTS11}
# )
+ADD_TEST(feTpSimplifyManyPathListFilter ${FEATUREEXTRACTION_TESTS11}
+ otbSimplifyManyPathListFilter
+ ${TEMP}/feTvSimplifyManyPathOutput.txt
+ 1.0
+ )
+
+
# A enrichir
SET(BasicFeatureExtraction_SRCS1
otbAlignImageToPath.cxx
@@ -1158,6 +1165,7 @@ otbCloudEstimatorDefaultFilter.cxx
otbCloudEstimatorFilter.cxx
#otbCloudDetectionFilterNew.cxx
#otbCloudDetectionFilter.cxx
+otbSimplifyManyPathListFilter.cxx
)
INCLUDE_DIRECTORIES("${OTBTesting_BINARY_DIR}")
diff --git a/Testing/Code/FeatureExtraction/otbFeatureExtractionTests11.cxx b/Testing/Code/FeatureExtraction/otbFeatureExtractionTests11.cxx
index f4b0f39a4870630c52e185f3e82fdf9baebfa2fa..bde83373e01536bbf19d682cc6c00d3406c26b81 100644
--- a/Testing/Code/FeatureExtraction/otbFeatureExtractionTests11.cxx
+++ b/Testing/Code/FeatureExtraction/otbFeatureExtractionTests11.cxx
@@ -32,4 +32,5 @@ REGISTER_TEST(otbCloudEstimatorDefaultFilter);
REGISTER_TEST(otbCloudEstimatorFilter);
/*REGISTER_TEST(otbCloudDetectionFilterNew);
REGISTER_TEST(otbCloudDetectionFilter);*/
+REGISTER_TEST(otbSimplifyManyPathListFilter);
}