From ecdc7424bc2db8b23757ff750a6af2465c934d46 Mon Sep 17 00:00:00 2001
From: Julien Malik <julien.malik@c-s.fr>
Date: Thu, 12 May 2011 13:36:34 +0200
Subject: [PATCH] TEST: update test of StreamingImageFileWriter
---
Testing/Code/IO/CMakeLists.txt | 133 +++++++++---------
...leWriterTestCalculateNumberOfDivisions.cxx | 28 ++--
2 files changed, 80 insertions(+), 81 deletions(-)
diff --git a/Testing/Code/IO/CMakeLists.txt b/Testing/Code/IO/CMakeLists.txt
index 9955c99c79..ffe09e93c0 100644
--- a/Testing/Code/IO/CMakeLists.txt
+++ b/Testing/Code/IO/CMakeLists.txt
@@ -1286,8 +1286,9 @@ ADD_TEST(ioTvStreamingIFWriterBSQWithStreaming ${IO_TESTS2}
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ otbIOTESTS10 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-# --- STREAMING IMAGE FILE WRITER ---
-# --- TESTS DIFFERENT ACTIVATE STREAMING PARAMETER ---
+
+# Test otb::StreamingImageFileWriter streaming
+
# 1. DEFAULT
ADD_TEST(ioTvStreamingImageFileWriterCalculateNumberOfDivisions_DEFAULT ${IO_TESTS10}
--compare-image ${EPSILON_9} ${INPUTDATA}/ToulouseQuickBird_Extrait_1500_3750.tif
@@ -1297,6 +1298,70 @@ ADD_TEST(ioTvStreamingImageFileWriterCalculateNumberOfDivisions_DEFAULT ${IO_TES
${TEMP}/ioStreamingImageFileWriterCalculateNumberOfDivisions_DEFAULT.tif
DEFAULT
)
+# 2. SetNumberOfDivisionsStrippedStreaming
+ADD_TEST(ioTvStreamingImageFileWriterCalculateNumberOfDivisions_SetNumberOfDivisionsStrippedStreaming ${IO_TESTS10}
+ --compare-image ${EPSILON_9} ${INPUTDATA}/ToulouseQuickBird_Extrait_1500_3750.tif
+ ${TEMP}/ioStreamingImageFileWriterCalculateNumberOfDivisions_SetNumberOfDivisionsStrippedStreaming.tif
+ otbStreamingImageFileWriterTestCalculateNumberOfDivisions
+ ${INPUTDATA}/ToulouseQuickBird_Extrait_1500_3750.tif
+ ${TEMP}/ioStreamingImageFileWriterCalculateNumberOfDivisions_SetNumberOfDivisionsStrippedStreaming.tif
+ SetNumberOfDivisionsStrippedStreaming
+ 10
+ )
+# 3. SetNumberOfDivisionsTiledStreaming
+ADD_TEST(ioTvStreamingImageFileWriterCalculateNumberOfDivisions_SetNumberOfDivisionsTiledStreamingS ${IO_TESTS10}
+ --compare-image ${EPSILON_9} ${INPUTDATA}/ToulouseQuickBird_Extrait_1500_3750.tif
+ ${TEMP}/ioStreamingImageFileWriterCalculateNumberOfDivisions_SetNumberOfDivisionsTiledStreaming.tif
+ otbStreamingImageFileWriterTestCalculateNumberOfDivisions
+ ${INPUTDATA}/ToulouseQuickBird_Extrait_1500_3750.tif
+ ${TEMP}/ioStreamingImageFileWriterCalculateNumberOfDivisions_SetNumberOfDivisionsTiledStreaming.tif
+ SetNumberOfDivisionsTiledStreaming
+ 10
+ )
+# 4. SetNumberOfLinesStrippedStreaming
+ADD_TEST(ioTvStreamingImageFileWriterCalculateNumberOfDivisions_SetNumberOfLinesStrippedStreaming ${IO_TESTS10}
+ --compare-image ${EPSILON_9} ${INPUTDATA}/ToulouseQuickBird_Extrait_1500_3750.tif
+ ${TEMP}/ioStreamingImageFileWriterCalculateNumberOfDivisions_SetNumberOfLinesStrippedStreaming.tif
+ otbStreamingImageFileWriterTestCalculateNumberOfDivisions
+ ${INPUTDATA}/ToulouseQuickBird_Extrait_1500_3750.tif
+ ${TEMP}/ioStreamingImageFileWriterCalculateNumberOfDivisions_SetNumberOfLinesStrippedStreaming.tif
+ SetNumberOfLinesStrippedStreaming
+ 5
+ )
+# 5. SetAutomaticStrippedStreaming
+ADD_TEST(ioTvStreamingImageFileWriterCalculateNumberOfDivisions_SetAutomaticStrippedStreaming ${IO_TESTS10}
+ --compare-image ${EPSILON_9} ${INPUTDATA}/ToulouseQuickBird_Extrait_1500_3750.tif
+ ${TEMP}/ioStreamingImageFileWriterCalculateNumberOfDivisions_SetAutomaticStrippedStreaming.tif
+ otbStreamingImageFileWriterTestCalculateNumberOfDivisions
+ ${INPUTDATA}/ToulouseQuickBird_Extrait_1500_3750.tif
+ ${TEMP}/ioStreamingImageFileWriterCalculateNumberOfDivisions_SetAutomaticStrippedStreaming.tif
+ SetAutomaticStrippedStreaming
+ 10
+ )
+# 6. SetTileDimensionTiledStreaming
+ADD_TEST(ioTvStreamingImageFileWriterCalculateNumberOfDivisions_SetTileDimensionTiledStreaming ${IO_TESTS10}
+ --compare-image ${EPSILON_9} ${INPUTDATA}/ToulouseQuickBird_Extrait_1500_3750.tif
+ ${TEMP}/ioStreamingImageFileWriterCalculateNumberOfDivisions_SetTileDimensionTiledStreaming.tif
+ otbStreamingImageFileWriterTestCalculateNumberOfDivisions
+ ${INPUTDATA}/ToulouseQuickBird_Extrait_1500_3750.tif
+ ${TEMP}/ioStreamingImageFileWriterCalculateNumberOfDivisions_SetTileDimensionTiledStreaming.tif
+ SetTileDimensionTiledStreaming
+ 32
+ )
+# 7. SetAutomaticTiledStreaming
+ADD_TEST(ioTvStreamingImageFileWriterCalculateNumberOfDivisions_SetAutomaticTiledStreaming ${IO_TESTS10}
+ --compare-image ${EPSILON_9} ${INPUTDATA}/ToulouseQuickBird_Extrait_1500_3750.tif
+ ${TEMP}/ioStreamingImageFileWriterCalculateNumberOfDivisions_SetAutomaticTiledStreaming.tif
+ otbStreamingImageFileWriterTestCalculateNumberOfDivisions
+ ${INPUTDATA}/ToulouseQuickBird_Extrait_1500_3750.tif
+ ${TEMP}/ioStreamingImageFileWriterCalculateNumberOfDivisions_SetAutomaticTiledStreaming.tif
+ SetAutomaticTiledStreaming
+ 10
+ )
+
+
+
+# Test otb::ImageFileWriter streaming
# 1.bis WITH IMAGEFILEWRITER : DEFAULT
ADD_TEST(ioTvStreamingWithImageFileWriterCalculateNumberOfDivisions_DEFAULT ${IO_TESTS10}
--compare-image ${EPSILON_9} ${INPUTDATA}/ToulouseQuickBird_Extrait_1500_3750.tif
@@ -1306,15 +1371,6 @@ ADD_TEST(ioTvStreamingWithImageFileWriterCalculateNumberOfDivisions_DEFAULT ${IO
${TEMP}/ioStreamingWithImageFileWriterCalculateNumberOfDivisions_DEFAULT.tif
DEFAULT
)
-# 2. AUTOMATIC_NUMBER_OF_STREAM_DIVISIONS
-ADD_TEST(ioTvStreamingImageFileWriterCalculateNumberOfDivisions_AUTOMATIC_NUMBER_OF_STREAM_DIVISIONS ${IO_TESTS10}
- --compare-image ${EPSILON_9} ${INPUTDATA}/ToulouseQuickBird_Extrait_1500_3750.tif
- ${TEMP}/ioStreamingImageFileWriterCalculateNumberOfDivisions_AUTOMATIC_NUMBER_OF_STREAM_DIVISIONS.tif
- otbStreamingImageFileWriterTestCalculateNumberOfDivisions
- ${INPUTDATA}/ToulouseQuickBird_Extrait_1500_3750.tif
- ${TEMP}/ioStreamingImageFileWriterCalculateNumberOfDivisions_AUTOMATIC_NUMBER_OF_STREAM_DIVISIONS.tif
- AUTOMATIC_NUMBER_OF_STREAM_DIVISIONS
- )
# 2.bis WITH IMAGEFILEWRITER : AUTOMATIC_NUMBER_OF_STREAM_DIVISIONS
ADD_TEST(ioTvStreamingWithImageFileWriterCalculateNumberOfDivisions_AUTOMATIC_NUMBER_OF_STREAM_DIVISIONS ${IO_TESTS10}
--compare-image ${EPSILON_9} ${INPUTDATA}/ToulouseQuickBird_Extrait_1500_3750.tif
@@ -1324,17 +1380,6 @@ ADD_TEST(ioTvStreamingWithImageFileWriterCalculateNumberOfDivisions_AUTOMATIC_NU
${TEMP}/ioStreamingWithImageFileWriterCalculateNumberOfDivisions_AUTOMATIC_NUMBER_OF_STREAM_DIVISIONS.tif
AUTOMATIC_NUMBER_OF_STREAM_DIVISIONS
)
-# 3. NUMBER_OF_STREAM_DIVISIONS
-ADD_TEST(ioTvStreamingImageFileWriterCalculateNumberOfDivisions_NUMBER_OF_STREAM_DIVISIONS ${IO_TESTS10}
- --compare-image ${EPSILON_9} ${INPUTDATA}/ToulouseQuickBird_Extrait_1500_3750.tif
- ${TEMP}/ioStreamingImageFileWriterCalculateNumberOfDivisions_NUMBER_OF_STREAM_DIVISIONS_10.tif
- otbStreamingImageFileWriterTestCalculateNumberOfDivisions
- ${INPUTDATA}/ToulouseQuickBird_Extrait_1500_3750.tif
- ${TEMP}/ioStreamingImageFileWriterCalculateNumberOfDivisions_NUMBER_OF_STREAM_DIVISIONS_10.tif
- NUMBER_OF_STREAM_DIVISIONS
- 10
- )
-
# 3.bis WITH IMAGEFILEWRITER : NUMBER_OF_STREAM_DIVISIONS
ADD_TEST(ioTvStreamingWithImageFileWriterCalculateNumberOfDivisions_NUMBER_OF_STREAM_DIVISIONS ${IO_TESTS10}
--compare-image ${EPSILON_9} ${INPUTDATA}/ToulouseQuickBird_Extrait_1500_3750.tif
@@ -1345,19 +1390,6 @@ ADD_TEST(ioTvStreamingWithImageFileWriterCalculateNumberOfDivisions_NUMBER_OF_ST
NUMBER_OF_STREAM_DIVISIONS
10
)
-
-
-
-# 4. BUFFER_MEMORY_SIZE
-ADD_TEST(ioTvStreamingImageFileWriterCalculateNumberOfDivisions_BUFFER_MEMORY_SIZE ${IO_TESTS10}
- --compare-image ${EPSILON_9} ${INPUTDATA}/ToulouseQuickBird_Extrait_1500_3750.tif
- ${TEMP}/ioStreamingImageFileWriterCalculateNumberOfDivisions_BUFFER_MEMORY_SIZE_8x2000x10.tif
- otbStreamingImageFileWriterTestCalculateNumberOfDivisions
- ${INPUTDATA}/ToulouseQuickBird_Extrait_1500_3750.tif
- ${TEMP}/ioStreamingImageFileWriterCalculateNumberOfDivisions_BUFFER_MEMORY_SIZE_8x2000x10.tif
- BUFFER_MEMORY_SIZE
- 8*2000*10
- )
# 4.bis WITH IMAGEFILEWRITER BUFFER_MEMORY_SIZE
ADD_TEST(ioTvStreamingWithImageFileWriterCalculateNumberOfDivisions_BUFFER_MEMORY_SIZE ${IO_TESTS10}
--compare-image ${EPSILON_9} ${INPUTDATA}/ToulouseQuickBird_Extrait_1500_3750.tif
@@ -1368,16 +1400,6 @@ ADD_TEST(ioTvStreamingWithImageFileWriterCalculateNumberOfDivisions_BUFFER_MEMOR
BUFFER_MEMORY_SIZE
8*2000*10
)
-# 5. BUFFER_NUMBER_OF_LINES
-ADD_TEST(ioTvStreamingImageFileWriterCalculateNumberOfDivisions_BUFFER_NUMBER_OF_LINES ${IO_TESTS10}
- --compare-image ${EPSILON_9} ${INPUTDATA}/ToulouseQuickBird_Extrait_1500_3750.tif
- ${TEMP}/ioStreamingImageFileWriterCalculateNumberOfDivisions_BUFFER_NUMBER_OF_LINES_1000.tif
- otbStreamingImageFileWriterTestCalculateNumberOfDivisions
- ${INPUTDATA}/ToulouseQuickBird_Extrait_1500_3750.tif
- ${TEMP}/ioStreamingImageFileWriterCalculateNumberOfDivisions_BUFFER_NUMBER_OF_LINES_1000.tif
- BUFFER_NUMBER_OF_LINES
- 1000
- )
# 5.bis WITH IMAGEFILEWRITER BUFFER_NUMBER_OF_LINES
ADD_TEST(ioTvStreamingWithImageFileWriterCalculateNumberOfDivisions_BUFFER_NUMBER_OF_LINES ${IO_TESTS10}
--compare-image ${EPSILON_9} ${INPUTDATA}/ToulouseQuickBird_Extrait_1500_3750.tif
@@ -1388,26 +1410,7 @@ ADD_TEST(ioTvStreamingWithImageFileWriterCalculateNumberOfDivisions_BUFFER_NUMBE
BUFFER_NUMBER_OF_LINES
1000
)
-# 6. TILING_STREAM_DIVISIONS
-ADD_TEST(ioTvStreamingImageFileWriterCalculateNumberOfDivisions_TILING_STREAM_DIVISIONS ${IO_TESTS10}
- --compare-image ${EPSILON_9} ${INPUTDATA}/ToulouseQuickBird_Extrait_1500_3750.tif
- ${TEMP}/ioStreamingImageFileWriterCalculateNumberOfDivisions_TILING_STREAM_DIVISIONS.tif
- otbStreamingImageFileWriterTestCalculateNumberOfDivisions
- ${INPUTDATA}/ToulouseQuickBird_Extrait_1500_3750.tif
- ${TEMP}/ioStreamingImageFileWriterCalculateNumberOfDivisions_TILING_STREAM_DIVISIONS.tif
- TILING_STREAM_DIVISIONS
- )
-# 7. TILING_STREAM_DIVISIONS with number of divisions
-ADD_TEST(ioTvStreamingImageFileWriterCalculateNumberOfDivisions_TILING_NUMBER_OF_STREAM_DIVISIONS ${IO_TESTS10}
- --compare-image ${EPSILON_9} ${INPUTDATA}/ToulouseQuickBird_Extrait_1500_3750.tif
- ${TEMP}/ioStreamingImageFileWriterCalculateNumberOfDivisions_TILING_NUMBER_OF_STREAM_DIVISIONS.tif
- otbStreamingImageFileWriterTestCalculateNumberOfDivisions
- ${INPUTDATA}/ToulouseQuickBird_Extrait_1500_3750.tif
- ${TEMP}/ioStreamingImageFileWriterCalculateNumberOfDivisions_TILING_NUMBER_OF_STREAM_DIVISIONS.tif
- TILING_NUMBER_OF_STREAM_DIVISIONS
- 100
- )
-
+
ADD_TEST(ioTvStreamingIFWriterWithFilter ${IO_TESTS10}
--compare-image ${EPSILON_9} ${BASELINE}/ioStreamingImageFileWriterWithFilter_1_100.hdr
${TEMP}/ioStreamingImageFileWriterWithFilter_1_100.hdr
diff --git a/Testing/Code/IO/otbStreamingImageFileWriterTestCalculateNumberOfDivisions.cxx b/Testing/Code/IO/otbStreamingImageFileWriterTestCalculateNumberOfDivisions.cxx
index 3b50db0fd8..f07dc2ca7d 100644
--- a/Testing/Code/IO/otbStreamingImageFileWriterTestCalculateNumberOfDivisions.cxx
+++ b/Testing/Code/IO/otbStreamingImageFileWriterTestCalculateNumberOfDivisions.cxx
@@ -15,9 +15,6 @@
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-
-
-
#include "itkExceptionObject.h"
#include <iostream>
@@ -48,30 +45,29 @@ int otbStreamingImageFileWriterTestCalculateNumberOfDivisions(int argc, char* ar
writer->SetFileName(outputFilename);
writer->SetInput(reader->GetOutput());
- if (MethodCalculateNumberOfStreamDivision == "AUTOMATIC_NUMBER_OF_STREAM_DIVISIONS")
+ if (MethodCalculateNumberOfStreamDivision == "SetNumberOfDivisionsStrippedStreaming")
{
- writer->SetAutomaticNumberOfStreamDivisions();
+ writer->SetNumberOfDivisionsStrippedStreaming(::atoi(argv[4]));
}
- else if (MethodCalculateNumberOfStreamDivision == "NUMBER_OF_STREAM_DIVISIONS")
+ else if (MethodCalculateNumberOfStreamDivision == "SetNumberOfDivisionsTiledStreaming")
{
- writer->SetNumberOfDivisionsStrippedStreaming(::atoi(argv[4]));
+ writer->SetNumberOfDivisionsTiledStreaming(::atoi(argv[4]));
}
- else if (MethodCalculateNumberOfStreamDivision == "BUFFER_MEMORY_SIZE")
+ else if (MethodCalculateNumberOfStreamDivision == "SetNumberOfLinesStrippedStreaming")
{
- writer->SetBufferMemorySize(::atoi(argv[4]));
+ writer->SetNumberOfLinesStrippedStreaming(::atoi(argv[4]));
}
- else if (MethodCalculateNumberOfStreamDivision == "BUFFER_NUMBER_OF_LINES")
+ else if (MethodCalculateNumberOfStreamDivision == "SetAutomaticStrippedStreaming")
{
- writer->SetBufferNumberOfLinesDivisions(::atoi(argv[4]));
+ writer->SetAutomaticStrippedStreaming(::atoi(argv[4]));
}
- else if (MethodCalculateNumberOfStreamDivision == "TILING_STREAM_DIVISIONS")
+ else if (MethodCalculateNumberOfStreamDivision == "SetTileDimensionTiledStreaming")
{
- writer->SetAutomaticTiledStreaming();
+ writer->SetTileDimensionTiledStreaming(::atoi(argv[4]));
}
- else if (MethodCalculateNumberOfStreamDivision == "TILING_NUMBER_OF_STREAM_DIVISIONS")
+ else if (MethodCalculateNumberOfStreamDivision == "SetAutomaticTiledStreaming")
{
- std::cout << "Number : " << ::atoi(argv[4]) << std::endl;
- writer->SetNumberOfDivisionsTiledStreaming(::atoi(argv[4]));
+ writer->SetAutomaticTiledStreaming(::atoi(argv[4]));
}
else if (MethodCalculateNumberOfStreamDivision == "DEFAULT")
{
--
GitLab