From c84232ac73fd52c11ae99c2ea2c0610455ecce72 Mon Sep 17 00:00:00 2001
From: Julien Michel <julien.michel@orfeo-toolbox.org>
Date: Wed, 13 Jan 2010 17:36:56 +0100
Subject: [PATCH] TEST: Last tests modifications
---
Testing/Code/Radiometry/CMakeLists.txt | 15 ++++++++-------
.../Radiometry/otbTerraSarBrightnessFunctor.cxx | 1 +
...tbTerraSarBrightnessImageComplexFilterTest.cxx | 14 +++++++-------
.../otbTerraSarBrightnessImageFilterTest.cxx | 13 ++++++-------
4 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/Testing/Code/Radiometry/CMakeLists.txt b/Testing/Code/Radiometry/CMakeLists.txt
index 1ce1542c15..e9d945fa6a 100644
--- a/Testing/Code/Radiometry/CMakeLists.txt
+++ b/Testing/Code/Radiometry/CMakeLists.txt
@@ -1030,12 +1030,7 @@ ADD_TEST(raTvAeronet_ArcachonLevel10_ExtractData ${RADIOMETRY_TESTS8}
# ------- TerraSarCalibrationFunctor ------------------------------
ADD_TEST(raTvTerraSarCalibrationFunctor ${RADIOMETRY_TESTS9}
-# --compare-image ${EPSILON}
-# ${BASELINE}/raTvTerraSarCalibrationImageFunctor.tif
-# ${TEMP}/raTvTerraSarCalibrationImageFunctor.tif
otbTerraSarCalibrationFunctor
-# ${INPUTDATA}/ExtractIMAGE_HH_SRA_strip_012.tif
-# ${TEMP}/raTvTerraSarCalibrationImageFunctor.tif
)
# ------- TerraSarCalibrationImageFilter ------------------------------
@@ -1147,7 +1142,8 @@ ADD_TEST(raTvTerraSarBrightnessImageFilterTest ${RADIOMETRY_TESTS9}
otbTerraSarBrightnessImageFilterTest
${INPUTDATA}/ExtractIMAGE_HH_SRA_strip_012.tif
${TEMP}/raTvTerraSarBrightnessImageFilterTest.tif
- 0 # don't use metadata
+ 0 # don't use metadata
+ 0 # results in linear scale
)
ADD_TEST(raTvTerraSarBrightnessImageComplexFilterTest ${RADIOMETRY_TESTS9}
@@ -1157,7 +1153,8 @@ ADD_TEST(raTvTerraSarBrightnessImageComplexFilterTest ${RADIOMETRY_TESTS9}
otbTerraSarBrightnessImageComplexFilterTest
${INPUTDATA}/ExtractIMAGE_HH_SRA_spot_074.tif
${TEMP}/raTvTerraSarBrightnessImageComplexFilterTest.tif
- 0 # don't use metadata
+ 0 # don't use metadata
+ 0 # results in linear scale
)
IF(OTB_DATA_USE_LARGEINPUT)
@@ -1169,6 +1166,8 @@ ADD_TEST(raTvTerraSarBrightnessImageFilterUPSALA ${RADIOMETRY_TESTS9}
${LARGEINPUT}/TERRASARX/UPSALA_GLACIER/TSX1_SAR__MGD/IMAGEDATA/IMAGE_HH_SRA_strip_012.tif
${TEMP}/raTvTerraSarBrightnessImageFilter_UPSALA.tif
1 # use metadata
+ 0 # results in linear scale
+ 2000 2000 250 250 # Extract
)
ADD_TEST(raTvTerraSarBrightnessImageComplexFilterTORONTO ${RADIOMETRY_TESTS9}
@@ -1179,6 +1178,8 @@ ADD_TEST(raTvTerraSarBrightnessImageComplexFilterTORONTO ${RADIOMETRY_TESTS9}
${LARGEINPUT}/TERRASARX/TORONTO/TSX1_SAR__SSC/IMAGEDATA/IMAGE_HH_SRA_spot_074.cos
${TEMP}/raTvTerraSarBrightnessImageComplexFilter_TORONTO.tif
1 # use metadata
+ 0 # results in linear scale
+ 2000 2000 250 250 # Extract
)
ENDIF(OTB_DATA_USE_LARGEINPUT)
diff --git a/Testing/Code/Radiometry/otbTerraSarBrightnessFunctor.cxx b/Testing/Code/Radiometry/otbTerraSarBrightnessFunctor.cxx
index d65bd51bbf..5cb9cafd4a 100644
--- a/Testing/Code/Radiometry/otbTerraSarBrightnessFunctor.cxx
+++ b/Testing/Code/Radiometry/otbTerraSarBrightnessFunctor.cxx
@@ -33,6 +33,7 @@ int otbTerraSarBrightnessFunctor(int argc, char * argv[])
FunctorType funct;
funct.SetCalibrationFactor(calFact);
+ funct.SetResultsInDecibels(false);
ScalarType inPix = static_cast<ScalarType>(atof(argv[1]));
ComplexType inCplxPix(static_cast<ScalarType>(atof(argv[2])), static_cast<ScalarType>(atof(argv[3])));
diff --git a/Testing/Code/Radiometry/otbTerraSarBrightnessImageComplexFilterTest.cxx b/Testing/Code/Radiometry/otbTerraSarBrightnessImageComplexFilterTest.cxx
index 6c973dcfa1..e7c0f93e5a 100644
--- a/Testing/Code/Radiometry/otbTerraSarBrightnessImageComplexFilterTest.cxx
+++ b/Testing/Code/Radiometry/otbTerraSarBrightnessImageComplexFilterTest.cxx
@@ -28,12 +28,11 @@ int otbTerraSarBrightnessImageComplexFilterTest(int argc, char * argv[])
{
const char * inputFileName = argv[1];
const char * outputFileName = argv[2];
- bool useMetadata = false;
- if(atoi(argv[3]) != 0)
- useMetadata = true;
+ const bool useMetadata = atoi(argv[3]);
+ const bool resultsInDb = atoi(argv[4]);
- typedef std::complex<double> ComplexType;
- typedef otb::Image<ComplexType, 2> ImageType;
+ typedef std::complex<double> ComplexType;
+ typedef otb::Image<ComplexType, 2> ImageType;
typedef otb::ImageFileReader<ImageType> ReaderType;
typedef otb::ImageFileWriter<ImageType> WriterType;
typedef otb::TerraSarBrightnessImageFilter<ImageType, ImageType> FilterType;
@@ -49,15 +48,16 @@ int otbTerraSarBrightnessImageComplexFilterTest(int argc, char * argv[])
writer->SetFileName(outputFileName);
reader->UpdateOutputInformation();
filter->SetInput(reader->GetOutput());
+ filter->SetResultsInDecibels(resultsInDb);
if( useMetadata )
{
// Generate an extract from the large input
ImageType::RegionType region;
ImageType::IndexType id;
- id[0] = 50; id[1] = 100;
+ id[0] = atoi(argv[5]); id[1] = atoi(argv[6]);
ImageType::SizeType size;
- size[0] = 150; size[1] = 100;
+ size[0] = atoi(argv[7]); size[1] = atoi(argv[8]);
region.SetIndex(id);
region.SetSize(size);
extractor->SetExtractionRegion(region);
diff --git a/Testing/Code/Radiometry/otbTerraSarBrightnessImageFilterTest.cxx b/Testing/Code/Radiometry/otbTerraSarBrightnessImageFilterTest.cxx
index 9ba4ac59f1..21eb605217 100644
--- a/Testing/Code/Radiometry/otbTerraSarBrightnessImageFilterTest.cxx
+++ b/Testing/Code/Radiometry/otbTerraSarBrightnessImageFilterTest.cxx
@@ -28,11 +28,10 @@ int otbTerraSarBrightnessImageFilterTest(int argc, char * argv[])
{
const char * inputFileName = argv[1];
const char * outputFileName = argv[2];
- bool useMetadata = false;
- if(atoi(argv[3]) != 0)
- useMetadata = true;
+ const bool useMetadata = atoi(argv[3]);
+ const bool resultsInDb = atoi(argv[4]);
- typedef otb::Image<std::complex<double>, 2> ImageType;
+ typedef otb::Image<double, 2> ImageType;
typedef otb::ImageFileReader<ImageType> ReaderType;
typedef otb::ImageFileWriter<ImageType> WriterType;
typedef otb::TerraSarBrightnessImageFilter<ImageType, ImageType> FilterType;
@@ -48,16 +47,16 @@ int otbTerraSarBrightnessImageFilterTest(int argc, char * argv[])
writer->SetFileName(outputFileName);
reader->UpdateOutputInformation();
filter->SetInput(reader->GetOutput());
- filter->SetNumberOfThreads(1);
+ filter->SetResultsInDecibels(resultsInDb);
if( useMetadata )
{
// Generate an extract from the large input
ImageType::RegionType region;
ImageType::IndexType id;
- id[0] = 2000; id[1] = 2000;
+ id[0] = atoi(argv[5]); id[1] = atoi(argv[6]);
ImageType::SizeType size;
- size[0] = 2000; size[1] = 2000;
+ size[0] = atoi(argv[7]); size[1] = atoi(argv[8]);
region.SetIndex(id);
region.SetSize(size);
extractor->SetExtractionRegion(region);
--
GitLab