Skip to content

Commit a8f4cfb

Browse files
N-Dekkerhjmjohnson
authored andcommitted
STYLE: Do speedImage->FillBuffer(1.0) instead of iteration, in tests
Replaced manual `for` and `while` loops with FillBuffer function calls, in FastMarching tests.
1 parent 320face commit a8f4cfb

8 files changed

+10
-49
lines changed

Modules/Filtering/FastMarching/test/itkFastMarchingExtensionImageFilterTest.cxx

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -123,13 +123,7 @@ itkFastMarchingExtensionImageFilterTest(int, char *[])
123123
speedImage->SetLargestPossibleRegion(region);
124124
speedImage->SetBufferedRegion(region);
125125
speedImage->Allocate();
126-
127-
itk::ImageRegionIterator<FloatImageType> speedIter(speedImage, speedImage->GetBufferedRegion());
128-
while (!speedIter.IsAtEnd())
129-
{
130-
speedIter.Set(1.0);
131-
++speedIter;
132-
}
126+
speedImage->FillBuffer(1.0);
133127

134128
marcher->SetInput(speedImage);
135129

Modules/Filtering/FastMarching/test/itkFastMarchingImageFilterRealTest1.cxx

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -147,13 +147,7 @@ itkFastMarchingImageFilterRealTest1(int itkNotUsed(argc), char * itkNotUsed(argv
147147
speedImage->SetLargestPossibleRegion(region);
148148
speedImage->SetBufferedRegion(region);
149149
speedImage->Allocate();
150-
151-
itk::ImageRegionIterator<FloatImageType> speedIter(speedImage, speedImage->GetBufferedRegion());
152-
while (!speedIter.IsAtEnd())
153-
{
154-
speedIter.Set(1.0);
155-
++speedIter;
156-
}
150+
speedImage->FillBuffer(1.0);
157151

158152
marcher->SetInput(speedImage);
159153

Modules/Filtering/FastMarching/test/itkFastMarchingImageFilterRealTest2.cxx

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ itkFastMarchingImageFilterRealTest2(int itkNotUsed(argc), char * itkNotUsed(argv
8585
speedImage->SetLargestPossibleRegion(region);
8686
speedImage->SetBufferedRegion(region);
8787
speedImage->Allocate();
88+
speedImage->FillBuffer(1.0);
8889

8990
// Set up an 'alive image'
9091
auto aliveImage = FloatImageType::New();
@@ -126,11 +127,9 @@ itkFastMarchingImageFilterRealTest2(int itkNotUsed(argc), char * itkNotUsed(argv
126127
maskImage->SetBufferedRegion(region);
127128
maskImage->Allocate();
128129

129-
itk::ImageRegionIterator<FloatImageType> speedIter(speedImage, speedImage->GetBufferedRegion());
130130
itk::ImageRegionIteratorWithIndex<FloatImageType> maskIter(maskImage, maskImage->GetBufferedRegion());
131-
while (!speedIter.IsAtEnd())
131+
while (!maskIter.IsAtEnd())
132132
{
133-
speedIter.Set(1.0);
134133
FloatImageType::IndexType idx = maskIter.GetIndex();
135134
if (((idx[0] > 22) && (idx[0] < 42) && (idx[1] > 27) && (idx[1] < 37)) ||
136135
((idx[1] > 22) && (idx[1] < 42) && (idx[0] > 27) && (idx[0] < 37)))
@@ -143,7 +142,6 @@ itkFastMarchingImageFilterRealTest2(int itkNotUsed(argc), char * itkNotUsed(argv
143142
}
144143

145144
++maskIter;
146-
++speedIter;
147145
}
148146

149147
marcher->SetInput(speedImage);

Modules/Filtering/FastMarching/test/itkFastMarchingImageFilterRealWithNumberOfElementsTest.cxx

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -113,13 +113,7 @@ itkFastMarchingImageFilterRealWithNumberOfElementsTest(int, char *[])
113113
speedImage->SetLargestPossibleRegion(region);
114114
speedImage->SetBufferedRegion(region);
115115
speedImage->Allocate();
116-
117-
itk::ImageRegionIterator<FloatImageType> speedIter(speedImage, speedImage->GetBufferedRegion());
118-
while (!speedIter.IsAtEnd())
119-
{
120-
speedIter.Set(1.0);
121-
++speedIter;
122-
}
116+
speedImage->FillBuffer(1.0);
123117

124118
marcher->SetInput(speedImage);
125119

Modules/Filtering/FastMarching/test/itkFastMarchingTest.cxx

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -181,12 +181,7 @@ itkFastMarchingTest(int argc, char * argv[])
181181
speedImage->SetLargestPossibleRegion(region);
182182
speedImage->SetBufferedRegion(region);
183183
speedImage->Allocate();
184-
185-
itk::ImageRegionIterator<FloatImage> speedIter(speedImage, speedImage->GetBufferedRegion());
186-
for (; !speedIter.IsAtEnd(); ++speedIter)
187-
{
188-
speedIter.Set(1.0);
189-
}
184+
speedImage->FillBuffer(1.0);
190185

191186
marcher->SetInput(speedImage);
192187
ITK_TEST_SET_GET_VALUE(speedImage, marcher->GetInput());

Modules/Filtering/FastMarching/test/itkFastMarchingTest2.cxx

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,18 +127,17 @@ itkFastMarchingTest2(int, char *[])
127127
speedImage->SetLargestPossibleRegion(region);
128128
speedImage->SetBufferedRegion(region);
129129
speedImage->Allocate();
130+
speedImage->FillBuffer(1.0);
130131

131132
// setup a binary mask image in float (to make sure it works with float)
132133
auto MaskImage = FloatImage::New();
133134
MaskImage->SetLargestPossibleRegion(region);
134135
MaskImage->SetBufferedRegion(region);
135136
MaskImage->Allocate();
136137

137-
itk::ImageRegionIterator<FloatImage> speedIter(speedImage, speedImage->GetBufferedRegion());
138138
itk::ImageRegionIteratorWithIndex<FloatImage> maskIter(MaskImage, MaskImage->GetBufferedRegion());
139-
while (!speedIter.IsAtEnd())
139+
while (!maskIter.IsAtEnd())
140140
{
141-
speedIter.Set(1.0);
142141
FloatImage::IndexType idx = maskIter.GetIndex();
143142
if (((idx[0] > 22) && (idx[0] < 42) && (idx[1] > 27) && (idx[1] < 37)) ||
144143
((idx[1] > 22) && (idx[1] < 42) && (idx[0] > 27) && (idx[0] < 37)))
@@ -151,7 +150,6 @@ itkFastMarchingTest2(int, char *[])
151150
}
152151

153152
++maskIter;
154-
++speedIter;
155153
}
156154

157155
speedImage->Print(std::cout);

Modules/Filtering/FastMarching/test/itkFastMarchingUpwindGradientBaseTest.cxx

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -125,14 +125,7 @@ itkFastMarchingUpwindGradientBaseTest(int, char *[])
125125
speedImage->SetLargestPossibleRegion(region);
126126
speedImage->SetBufferedRegion(region);
127127
speedImage->Allocate();
128-
129-
itk::ImageRegionIterator<FloatImageType> speedIter(speedImage, speedImage->GetBufferedRegion());
130-
131-
while (!speedIter.IsAtEnd())
132-
{
133-
speedIter.Set(1.0);
134-
++speedIter;
135-
}
128+
speedImage->FillBuffer(1.0);
136129

137130
// speedImage->Print( std::cout );
138131
marcher->SetInput(speedImage);

Modules/Filtering/FastMarching/test/itkFastMarchingUpwindGradientTest.cxx

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -131,12 +131,7 @@ itkFastMarchingUpwindGradientTest(int, char *[])
131131
speedImage->SetLargestPossibleRegion(region);
132132
speedImage->SetBufferedRegion(region);
133133
speedImage->Allocate();
134-
135-
itk::ImageRegionIterator<FloatImage> speedIter(speedImage, speedImage->GetBufferedRegion());
136-
for (; !speedIter.IsAtEnd(); ++speedIter)
137-
{
138-
speedIter.Set(1.0);
139-
}
134+
speedImage->FillBuffer(1.0);
140135

141136
// speedImage->Print( std::cout );
142137
marcher->SetInput(speedImage);

0 commit comments

Comments
 (0)