From 40b32ee8cc4e98b9c627252e7a82f4a5895782fa Mon Sep 17 00:00:00 2001
From: Julien Malik <julien.malik@c-s.fr>
Date: Tue, 12 Jun 2012 13:08:16 +0200
Subject: [PATCH] ENH: move otbHoover to Code/Segmentation
---
.../otbHooverInstanceFilter.h | 0
.../otbHooverInstanceFilter.txx | 0
.../otbHooverMatrixFilter.h | 0
.../otbHooverMatrixFilter.txx | 0
Testing/Code/OBIA/CMakeLists.txt | 31 -----------------
Testing/Code/OBIA/otbOBIATests1.cxx | 4 ---
Testing/Code/Segmentation/CMakeLists.txt | 33 +++++++++++++++++++
.../otbHooverInstanceFilterNew.cxx | 0
...tbHooverInstanceFilterToAttributeImage.cxx | 0
.../otbHooverMatrixFilter.cxx | 0
.../otbHooverMatrixFilterNew.cxx | 0
.../Segmentation/otbSegmentationTests1.cxx | 5 ++-
12 files changed, 37 insertions(+), 36 deletions(-)
rename Code/{OBIA => Segmentation}/otbHooverInstanceFilter.h (100%)
rename Code/{OBIA => Segmentation}/otbHooverInstanceFilter.txx (100%)
rename Code/{OBIA => Segmentation}/otbHooverMatrixFilter.h (100%)
rename Code/{OBIA => Segmentation}/otbHooverMatrixFilter.txx (100%)
rename Testing/Code/{OBIA => Segmentation}/otbHooverInstanceFilterNew.cxx (100%)
rename Testing/Code/{OBIA => Segmentation}/otbHooverInstanceFilterToAttributeImage.cxx (100%)
rename Testing/Code/{OBIA => Segmentation}/otbHooverMatrixFilter.cxx (100%)
rename Testing/Code/{OBIA => Segmentation}/otbHooverMatrixFilterNew.cxx (100%)
diff --git a/Code/OBIA/otbHooverInstanceFilter.h b/Code/Segmentation/otbHooverInstanceFilter.h
similarity index 100%
rename from Code/OBIA/otbHooverInstanceFilter.h
rename to Code/Segmentation/otbHooverInstanceFilter.h
diff --git a/Code/OBIA/otbHooverInstanceFilter.txx b/Code/Segmentation/otbHooverInstanceFilter.txx
similarity index 100%
rename from Code/OBIA/otbHooverInstanceFilter.txx
rename to Code/Segmentation/otbHooverInstanceFilter.txx
diff --git a/Code/OBIA/otbHooverMatrixFilter.h b/Code/Segmentation/otbHooverMatrixFilter.h
similarity index 100%
rename from Code/OBIA/otbHooverMatrixFilter.h
rename to Code/Segmentation/otbHooverMatrixFilter.h
diff --git a/Code/OBIA/otbHooverMatrixFilter.txx b/Code/Segmentation/otbHooverMatrixFilter.txx
similarity index 100%
rename from Code/OBIA/otbHooverMatrixFilter.txx
rename to Code/Segmentation/otbHooverMatrixFilter.txx
diff --git a/Testing/Code/OBIA/CMakeLists.txt b/Testing/Code/OBIA/CMakeLists.txt
index 02919ab844..deecaa3e46 100644
--- a/Testing/Code/OBIA/CMakeLists.txt
+++ b/Testing/Code/OBIA/CMakeLists.txt
@@ -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
diff --git a/Testing/Code/OBIA/otbOBIATests1.cxx b/Testing/Code/OBIA/otbOBIATests1.cxx
index eefdc5bdd4..764959e86e 100644
--- a/Testing/Code/OBIA/otbOBIATests1.cxx
+++ b/Testing/Code/OBIA/otbOBIATests1.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);
diff --git a/Testing/Code/Segmentation/CMakeLists.txt b/Testing/Code/Segmentation/CMakeLists.txt
index ca781ac1dc..b4133d6e6f 100644
--- a/Testing/Code/Segmentation/CMakeLists.txt
+++ b/Testing/Code/Segmentation/CMakeLists.txt
@@ -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
)
diff --git a/Testing/Code/OBIA/otbHooverInstanceFilterNew.cxx b/Testing/Code/Segmentation/otbHooverInstanceFilterNew.cxx
similarity index 100%
rename from Testing/Code/OBIA/otbHooverInstanceFilterNew.cxx
rename to Testing/Code/Segmentation/otbHooverInstanceFilterNew.cxx
diff --git a/Testing/Code/OBIA/otbHooverInstanceFilterToAttributeImage.cxx b/Testing/Code/Segmentation/otbHooverInstanceFilterToAttributeImage.cxx
similarity index 100%
rename from Testing/Code/OBIA/otbHooverInstanceFilterToAttributeImage.cxx
rename to Testing/Code/Segmentation/otbHooverInstanceFilterToAttributeImage.cxx
diff --git a/Testing/Code/OBIA/otbHooverMatrixFilter.cxx b/Testing/Code/Segmentation/otbHooverMatrixFilter.cxx
similarity index 100%
rename from Testing/Code/OBIA/otbHooverMatrixFilter.cxx
rename to Testing/Code/Segmentation/otbHooverMatrixFilter.cxx
diff --git a/Testing/Code/OBIA/otbHooverMatrixFilterNew.cxx b/Testing/Code/Segmentation/otbHooverMatrixFilterNew.cxx
similarity index 100%
rename from Testing/Code/OBIA/otbHooverMatrixFilterNew.cxx
rename to Testing/Code/Segmentation/otbHooverMatrixFilterNew.cxx
diff --git a/Testing/Code/Segmentation/otbSegmentationTests1.cxx b/Testing/Code/Segmentation/otbSegmentationTests1.cxx
index 0028f6f3be..2e08643da5 100644
--- a/Testing/Code/Segmentation/otbSegmentationTests1.cxx
+++ b/Testing/Code/Segmentation/otbSegmentationTests1.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);
}
--
GitLab