Skip to content

WIP: Replace "vnl_sample.h" with <random> in ConnectedComponent tests #5622

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
+24 −8
Draft

WIP: Replace "vnl_sample.h" with <random> in ConnectedComponent tests #5622

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions Modules/Segmentation/ConnectedComponents/test/itkConnectedComponentImageFilterTest.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
#include "itkImageFileReader.h"
#include "itkImageFileWriter.h"
#include "itkSimpleFilterWatcher.h"
#include "vnl/vnl_sample.h"
#include "itkTestingMacros.h"
#include <algorithm> // For generate.
#include <random> // For mt19937.

int
itkConnectedComponentImageFilterTest(int argc, char * argv[])
Expand Down Expand Up @@ -124,12 +124,20 @@ itkConnectedComponentImageFilterTest(int argc, char * argv[])

std::vector<RGBPixelType> colormap;
colormap.resize(numObjects + 1);
vnl_sample_reseed(1031571);

using RGBComponentType = RGBPixelType::ComponentType;
constexpr auto maxRGBComponentValue = std::numeric_limits<RGBComponentType>::max();

constexpr std::mt19937::result_type randomSeed{ 1031571 };
std::mt19937 randomNumberEngine(randomSeed);
std::uniform_int_distribution<> randomNumberDistribution(maxRGBComponentValue / 3, maxRGBComponentValue);

for (auto & i : colormap)
{
RGBPixelType px;
std::generate(
px.begin(), px.end(), [] { return static_cast<unsigned char>(255 * vnl_sample_uniform(0.3333, 1.0)); });
std::generate(px.begin(), px.end(), [&randomNumberEngine, &randomNumberDistribution] {
return static_cast<RGBComponentType>(randomNumberDistribution(randomNumberEngine));
});

i = px;
}
Expand Down
16 changes: 12 additions & 4 deletions Modules/Segmentation/ConnectedComponents/test/itkConnectedComponentImageFilterTestRGB.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
#include "itkImageFileWriter.h"
#include "itkSimpleFilterWatcher.h"
#include "itkTestingMacros.h"
#include "vnl/vnl_sample.h"
#include <algorithm> // For generate.
#include <random> // For mt19937.

int
itkConnectedComponentImageFilterTestRGB(int argc, char * argv[])
Expand Down Expand Up @@ -104,11 +104,19 @@ itkConnectedComponentImageFilterTestRGB(int argc, char * argv[])
std::vector<RGBPixelType> colormap;
RGBPixelType px;
colormap.resize(numObjects + 1);
vnl_sample_reseed(1031571);

using RGBComponentType = RGBPixelType::ComponentType;
constexpr auto maxRGBComponentValue = std::numeric_limits<RGBComponentType>::max();

constexpr std::mt19937::result_type randomSeed{ 1031571 };
std::mt19937 randomNumberEngine(randomSeed);
std::uniform_int_distribution<> randomNumberDistribution(maxRGBComponentValue / 3, maxRGBComponentValue);

for (auto & i : colormap)
{
std::generate(
px.begin(), px.end(), [] { return static_cast<unsigned char>(255 * vnl_sample_uniform(0.3333, 1.0)); });
std::generate(px.begin(), px.end(), [&randomNumberEngine, &randomNumberDistribution] {
return static_cast<RGBComponentType>(randomNumberDistribution(randomNumberEngine));
});

i = px;
}
Expand Down
Loading