From 87da3c6485efe5f9aec27d35c1a2b7f474c8f29a Mon Sep 17 00:00:00 2001
From: Julien Malik <julien.malik@c-s.fr>
Date: Mon, 21 Mar 2011 19:26:17 +0100
Subject: [PATCH] ENH: update tests following StreamingManager integration in
Persistent filters
---
.../otbMatrixTransposeMatrixImageFilter.cxx | 3 +--
...StreamingInnerProductVectorImageFilter.cxx | 3 +--
.../otbStreamingMinMaxImageFilter.cxx | 3 +--
.../otbStreamingMinMaxVectorImageFilter.cxx | 3 +--
.../otbStreamingStatisticsImageFilter.cxx | 3 +--
...tbStreamingStatisticsVectorImageFilter.cxx | 3 +--
.../otbDescriptorsListSampleGenerator.cxx | 21 ++-----------------
.../otbObjectDetectionClassifier.cxx | 11 ++--------
8 files changed, 10 insertions(+), 40 deletions(-)
diff --git a/Testing/Code/BasicFilters/otbMatrixTransposeMatrixImageFilter.cxx b/Testing/Code/BasicFilters/otbMatrixTransposeMatrixImageFilter.cxx
index 2d9a433f50..91f728949a 100644
--- a/Testing/Code/BasicFilters/otbMatrixTransposeMatrixImageFilter.cxx
+++ b/Testing/Code/BasicFilters/otbMatrixTransposeMatrixImageFilter.cxx
@@ -49,8 +49,7 @@ int otbMatrixTransposeMatrixImageFilter(int argc, char * argv[])
reader1->SetFileName(infname1);
reader2->SetFileName(infname2);
- // filter->SetStreamingMode(otb::SET_NUMBER_OF_STREAM_DIVISIONS);
- //filter->GetStreamer()->SetNumberOfStreamDivisions(200);
+ filter->GetStreamer()->GetStreamingManager()->SetStrippedNumberOfLinesStreamingMode(200);
filter->SetFirstInput(reader1->GetOutput());
filter->SetSecondInput(reader2->GetOutput());
filter->SetUsePadFirstInput(true);
diff --git a/Testing/Code/BasicFilters/otbStreamingInnerProductVectorImageFilter.cxx b/Testing/Code/BasicFilters/otbStreamingInnerProductVectorImageFilter.cxx
index bf4c392613..842fde27ec 100644
--- a/Testing/Code/BasicFilters/otbStreamingInnerProductVectorImageFilter.cxx
+++ b/Testing/Code/BasicFilters/otbStreamingInnerProductVectorImageFilter.cxx
@@ -39,8 +39,7 @@ int otbStreamingInnerProductVectorImageFilter(int argc, char* argv[])
// Instantiation object
FilterType::Pointer filter = FilterType::New();
-
- //filter->GetStreamer()->SetNumberOfStreamDivisions(10);
+ filter->GetStreamer()->GetStreamingManager()->SetStrippedNumberOfLinesStreamingMode(10);
filter->SetCenterData(centerdata);
filter->SetInput(reader->GetOutput());
filter->Update();
diff --git a/Testing/Code/BasicFilters/otbStreamingMinMaxImageFilter.cxx b/Testing/Code/BasicFilters/otbStreamingMinMaxImageFilter.cxx
index 5f59b2d7f7..8cb67d3680 100644
--- a/Testing/Code/BasicFilters/otbStreamingMinMaxImageFilter.cxx
+++ b/Testing/Code/BasicFilters/otbStreamingMinMaxImageFilter.cxx
@@ -42,8 +42,7 @@ int otbStreamingMinMaxImageFilter(int argc, char * argv[])
ReaderType::Pointer reader = ReaderType::New();
reader->SetFileName(infname);
- //filter->SetStreamingMode(otb::SET_NUMBER_OF_STREAM_DIVISIONS);
- //filter->GetStreamer()->SetNumberOfStreamDivisions(200);
+ filter->GetStreamer()->GetStreamingManager()->SetStrippedNumberOfLinesStreamingMode(200);
filter->SetInput(reader->GetOutput());
otb::StandardFilterWatcher watcher(filter, "Min Max Computation");
filter->Update();
diff --git a/Testing/Code/BasicFilters/otbStreamingMinMaxVectorImageFilter.cxx b/Testing/Code/BasicFilters/otbStreamingMinMaxVectorImageFilter.cxx
index f8f2e265fe..d114e5d7a0 100644
--- a/Testing/Code/BasicFilters/otbStreamingMinMaxVectorImageFilter.cxx
+++ b/Testing/Code/BasicFilters/otbStreamingMinMaxVectorImageFilter.cxx
@@ -42,8 +42,7 @@ int otbStreamingMinMaxVectorImageFilter(int argc, char * argv[])
ReaderType::Pointer reader = ReaderType::New();
reader->SetFileName(infname);
- //filter->SetStreamingMode(otb::SET_NUMBER_OF_STREAM_DIVISIONS);
- //filter->GetStreamer()->SetNumberOfStreamDivisions(200);
+ filter->GetStreamer()->GetStreamingManager()->SetStrippedNumberOfLinesStreamingMode(200);
filter->SetInput(reader->GetOutput());
otb::StandardFilterWatcher watcher(filter, "Min Max Computation");
filter->Update();
diff --git a/Testing/Code/BasicFilters/otbStreamingStatisticsImageFilter.cxx b/Testing/Code/BasicFilters/otbStreamingStatisticsImageFilter.cxx
index 22fae71fb8..474097031e 100644
--- a/Testing/Code/BasicFilters/otbStreamingStatisticsImageFilter.cxx
+++ b/Testing/Code/BasicFilters/otbStreamingStatisticsImageFilter.cxx
@@ -42,8 +42,7 @@ int otbStreamingStatisticsImageFilter(int argc, char * argv[])
ReaderType::Pointer reader = ReaderType::New();
reader->SetFileName(infname);
- //filter->GetStreamer()->SetStreamingMode(otb::SET_NUMBER_OF_STREAM_DIVISIONS);
- //filter->GetStreamer()->SetNumberOfStreamDivisions(200);
+ filter->GetStreamer()->GetStreamingManager()->SetStrippedNumberOfLinesStreamingMode(200);
filter->SetInput(reader->GetOutput());
filter->Update();
diff --git a/Testing/Code/BasicFilters/otbStreamingStatisticsVectorImageFilter.cxx b/Testing/Code/BasicFilters/otbStreamingStatisticsVectorImageFilter.cxx
index 8316823fb3..6ff493c558 100644
--- a/Testing/Code/BasicFilters/otbStreamingStatisticsVectorImageFilter.cxx
+++ b/Testing/Code/BasicFilters/otbStreamingStatisticsVectorImageFilter.cxx
@@ -41,8 +41,7 @@ int otbStreamingStatisticsVectorImageFilter(int argc, char * argv[])
ReaderType::Pointer reader = ReaderType::New();
reader->SetFileName(infname);
- //filter->SetStreamingMode(otb::SET_NUMBER_OF_STREAM_DIVISIONS);
- //filter->GetStreamer()->SetNumberOfStreamDivisions(200);
+ filter->GetStreamer()->GetStreamingManager()->SetStrippedNumberOfLinesStreamingMode(200);
filter->SetInput(reader->GetOutput());
filter->Update();
diff --git a/Testing/Code/ObjectDetection/otbDescriptorsListSampleGenerator.cxx b/Testing/Code/ObjectDetection/otbDescriptorsListSampleGenerator.cxx
index e52c587fc6..c4a7b9af95 100644
--- a/Testing/Code/ObjectDetection/otbDescriptorsListSampleGenerator.cxx
+++ b/Testing/Code/ObjectDetection/otbDescriptorsListSampleGenerator.cxx
@@ -157,15 +157,7 @@ int otbDescriptorsListSampleGenerator(int argc, char* argv[])
descriptorsGenerator->SetDescriptorsFunction(descriptorsFunction.GetPointer());
descriptorsGenerator->SetNeighborhoodRadius(neighborhood);
- if (streaming == 0)
- {
- descriptorsGenerator->GetStreamer()->SetNumberOfStreamDivisions(1);
- }
- else
- {
- descriptorsGenerator->GetStreamer()->SetNumberOfStreamDivisions(streaming);
- }
-
+ descriptorsGenerator->GetStreamer()->GetStreamingManager()->SetStrippedNumberOfLinesStreamingMode(streaming);
descriptorsGenerator->Update();
@@ -240,16 +232,7 @@ int otbDescriptorsSVMModelCreation(int argc, char* argv[])
descriptorsGenerator->SetSamplesLocations(vectorDataReader->GetOutput());
descriptorsGenerator->SetDescriptorsFunction(descriptorsFunction.GetPointer());
descriptorsGenerator->SetNeighborhoodRadius(5);
-
- if (streaming == 0)
- {
- descriptorsGenerator->GetStreamer()->SetNumberOfStreamDivisions(1);
- }
- else
- {
- descriptorsGenerator->GetStreamer()->SetNumberOfStreamDivisions(streaming);
- }
-
+ descriptorsGenerator->GetStreamer()->GetStreamingManager()->SetStrippedNumberOfLinesStreamingMode(streaming);
descriptorsGenerator->Update();
// Normalize the samples
diff --git a/Testing/Code/ObjectDetection/otbObjectDetectionClassifier.cxx b/Testing/Code/ObjectDetection/otbObjectDetectionClassifier.cxx
index fe3846df05..e394c2ea2b 100644
--- a/Testing/Code/ObjectDetection/otbObjectDetectionClassifier.cxx
+++ b/Testing/Code/ObjectDetection/otbObjectDetectionClassifier.cxx
@@ -135,15 +135,8 @@ int otbObjectDetectionClassifier(int argc, char* argv[])
classifier->SetShifts(statisticsReader->GetStatisticVectorByName("mean"));
classifier->SetScales(statisticsReader->GetStatisticVectorByName("stddev"));
- if (streaming == 0)
- {
- classifier->GetStreamer()->SetNumberOfStreamDivisions(1);
- }
- else
- {
- classifier->GetStreamer()->SetNumberOfStreamDivisions(streaming);
- }
-
+ // 0 means no streaming
+ classifier->GetStreamer()->GetStreamingManager()->SetStrippedNumberOfLinesStreamingMode(streaming);
classifier->Update();
std::vector<ObjectDetectionClassifierType::PointType> points;
--
GitLab