Commit 40b32ee8 authored by Julien Malik's avatar Julien Malik
Browse files

ENH: move otbHoover to Code/Segmentation

parent bd3e7976
......@@ -222,35 +222,9 @@ ADD_TEST(obTvLabelImageToLabelMapWithAdjacencyFilter ${OBIA_TESTS3}
${TEMP}/obTvLabelImageToLabelMapWithAdjacencyFilterOutput.txt
)
ADD_TEST(obTuHooverMatrixFilterNew ${OBIA_TESTS1}
otbHooverMatrixFilterNew)
ADD_TEST(obTvHooverMatrixFilter ${OBIA_TESTS1}
--compare-ascii ${NOTOL}
${BASELINE_FILES}/obTvHooverMatrixFilter.txt
${TEMP}/obTvHooverMatrixFilter.txt
otbHooverMatrixFilter
${INPUTDATA}/Seg1InputForRCC8Graph.tif
${INPUTDATA}/Seg2InputForRCC8Graph.tif
${TEMP}/obTvHooverMatrixFilter.txt
)
ADD_TEST(obTuHooverInstanceFilterNew ${OBIA_TESTS1}
otbHooverInstanceFilterNew)
ADD_TEST(obTuLabelMapToAttributeImageFilterNew ${OBIA_TESTS1}
otbLabelMapToAttributeImageFilterNew)
ADD_TEST(obTvHooverInstanceFilterToAttributeImage ${OBIA_TESTS1}
--compare-image ${EPSILON_9}
${BASELINE}/obTvHooverInstanceFilterToAttributeImage.tif
${TEMP}/obTvHooverInstanceFilterToAttributeImage.tif
otbHooverInstanceFilterToAttributeImage
${INPUTDATA}/maur_GT.tif
${INPUTDATA}/maur_labelled.tif
${TEMP}/obTvHooverInstanceFilterToAttributeImage.tif
)
ADD_TEST(obTuLabelImageToVectorDataFilterNew ${OBIA_TESTS1}
otbLabelImageToVectorDataFilterNew)
......@@ -263,7 +237,6 @@ ADD_TEST(obTvLabelImageToVectorDataFilter ${OBIA_TESTS1}
${TEMP}/obTuLabelImageToVectorDataFilter.shp
)
ADD_TEST(obTuLabelImageToOGRDataSourceFilterNew ${OBIA_TESTS1}
otbLabelImageToOGRDataSourceFilterNew)
......@@ -330,11 +303,7 @@ otbMeanShiftStreamingConnectedComponentOBIATest.cxx
otbMeanShiftConnectedComponentSegmentationFilterTest.cxx
otbMeanShiftSegmentationFilter.cxx
otbWatershedSegmentationFilter.cxx
otbHooverMatrixFilterNew.cxx
otbHooverMatrixFilter.cxx
otbHooverInstanceFilterNew.cxx
otbLabelMapToAttributeImageFilterNew.cxx
otbHooverInstanceFilterToAttributeImage.cxx
otbLabelImageToVectorDataFilterNew.cxx
otbLabelImageToVectorDataFilter.cxx
otbLabelImageToOGRDataSourceFilter.cxx
......
......@@ -58,11 +58,7 @@ REGISTER_TEST(otbMeanShiftStreamingConnectedComponentSegmentationOBIAToVectorDat
REGISTER_TEST(otbMeanShiftConnectedComponentSegmentationFilter);
REGISTER_TEST(otbMeanShiftSegmentationFilter);
REGISTER_TEST(otbWatershedSegmentationFilter);
REGISTER_TEST(otbHooverMatrixFilterNew);
REGISTER_TEST(otbHooverMatrixFilter);
REGISTER_TEST(otbHooverInstanceFilterNew);
REGISTER_TEST(otbLabelMapToAttributeImageFilterNew);
REGISTER_TEST(otbHooverInstanceFilterToAttributeImage);
REGISTER_TEST(otbLabelImageToVectorDataFilterNew);
REGISTER_TEST(otbLabelImageToVectorDataFilter);
REGISTER_TEST(otbLabelImageToOGRDataSourceFilterNew);
......
......@@ -5,6 +5,35 @@ SET(SEGMENTATION_TESTS1 ${CXX_TEST_PATH}/otbSegmentationTests1)
ENDIF( NOT OTB_DISABLE_CXX_TESTING AND BUILD_TESTING )
# ------- otb::HooverMatrix & otb::HooverInstance -------------
ADD_TEST(obTuHooverMatrixFilterNew ${OBIA_TESTS1}
otbHooverMatrixFilterNew)
ADD_TEST(obTvHooverMatrixFilter ${OBIA_TESTS1}
--compare-ascii ${NOTOL}
${BASELINE_FILES}/obTvHooverMatrixFilter.txt
${TEMP}/obTvHooverMatrixFilter.txt
otbHooverMatrixFilter
${INPUTDATA}/Seg1InputForRCC8Graph.tif
${INPUTDATA}/Seg2InputForRCC8Graph.tif
${TEMP}/obTvHooverMatrixFilter.txt
)
ADD_TEST(obTuHooverInstanceFilterNew ${OBIA_TESTS1}
otbHooverInstanceFilterNew)
ADD_TEST(obTvHooverInstanceFilterToAttributeImage ${OBIA_TESTS1}
--compare-image ${EPSILON_9}
${BASELINE}/obTvHooverInstanceFilterToAttributeImage.tif
${TEMP}/obTvHooverInstanceFilterToAttributeImage.tif
otbHooverInstanceFilterToAttributeImage
${INPUTDATA}/maur_GT.tif
${INPUTDATA}/maur_labelled.tif
${TEMP}/obTvHooverInstanceFilterToAttributeImage.tif
)
# ------- otb::StreamingVectorizedSegmentation -------------
ADD_TEST(obTuStreamingImageToOGRDataSourceSegmentationFilterNew ${SEGMENTATION_TESTS1}
otbStreamingImageToOGRDataSourceSegmentationFilterNew)
......@@ -64,6 +93,10 @@ ADD_TEST(obTuOGRDataSourceStreamStitchingFilter ${SEGMENTATION_TESTS1}
SET(Segmentation_SRCS1
otbHooverMatrixFilterNew.cxx
otbHooverMatrixFilter.cxx
otbHooverInstanceFilterNew.cxx
otbHooverInstanceFilterToAttributeImage.cxx
otbStreamingImageToOGRDataSourceSegmentationFilter.cxx
otbOGRDataSourceStreamStitchingFilter.cxx
)
......
......@@ -28,5 +28,8 @@ void RegisterTests()
REGISTER_TEST(otbStreamingImageToOGRDataSourceSegmentationFilterNew);
REGISTER_TEST(otbStreamingImageToOGRDataSourceSegmentationFilter);
REGISTER_TEST(otbOGRDataSourceStreamStitchingFilter);
REGISTER_TEST(otbHooverMatrixFilterNew);
REGISTER_TEST(otbHooverMatrixFilter);
REGISTER_TEST(otbHooverInstanceFilterNew);
REGISTER_TEST(otbHooverInstanceFilterToAttributeImage);
}
Markdown is supported
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