From 51603bebe6f077861516abc00311771c145d5230 Mon Sep 17 00:00:00 2001 From: Niels Dekker Date: Tue, 25 Nov 2025 18:18:10 +0100 Subject: [PATCH 1/2] STYLE: Remove #include "vnl/vnl_sample.h" from RegistrationMethodTest_17 It was not used anymore, after commit ca1c75227096f955613992b4e5e8b819fd7528dc "BUG: Add fixed seed to registration tests", May 17, 2017. --- .../Common/test/itkImageRegistrationMethodTest_17.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/Registration/Common/test/itkImageRegistrationMethodTest_17.cxx b/Modules/Registration/Common/test/itkImageRegistrationMethodTest_17.cxx index b4b4b833122..6a23ce27ed9 100644 --- a/Modules/Registration/Common/test/itkImageRegistrationMethodTest_17.cxx +++ b/Modules/Registration/Common/test/itkImageRegistrationMethodTest_17.cxx @@ -23,7 +23,7 @@ #include "itkTextOutput.h" #include "itkCommandIterationUpdate.h" -#include "vnl/vnl_sample.h" + namespace { From fa35af353db93c3675e95b9638fd3ba46410be72 Mon Sep 17 00:00:00 2001 From: Niels Dekker Date: Tue, 25 Nov 2025 18:54:37 +0100 Subject: [PATCH 2/2] ENH: Replace vnl_sample with `` in SignedDistanceFunction test Replaced vnl_sample_normal with `std::mt19937` and `std::normal_distribution`. --- .../itkPCAShapeSignedDistanceFunctionGTest.cxx | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Modules/Segmentation/SignedDistanceFunction/test/itkPCAShapeSignedDistanceFunctionGTest.cxx b/Modules/Segmentation/SignedDistanceFunction/test/itkPCAShapeSignedDistanceFunctionGTest.cxx index 73e31f55c8b..20815eb82c1 100644 --- a/Modules/Segmentation/SignedDistanceFunction/test/itkPCAShapeSignedDistanceFunctionGTest.cxx +++ b/Modules/Segmentation/SignedDistanceFunction/test/itkPCAShapeSignedDistanceFunctionGTest.cxx @@ -18,12 +18,13 @@ #include "itkPCAShapeSignedDistanceFunction.h" -#include "vnl/vnl_sample.h" #include "itkImageRegionIterator.h" #include "itkEuler2DTransform.h" #include +#include // For mt19937. + /** * This module tests the functionality of the PCAShapeSignedDistanceFunction * class. @@ -65,7 +66,8 @@ TEST(PCAShapeSignedDistanceFunction, Test) // set up the random number generator - vnl_sample_reseed(); + std::mt19937 randomNumberEngine{}; + std::normal_distribution randomNumberDistribution(0.0, 1.0); // set up the mean image auto meanImage = ImageType::New(); @@ -77,7 +79,7 @@ TEST(PCAShapeSignedDistanceFunction, Test) for (meanImageIt.GoToBegin(); !meanImageIt.IsAtEnd(); ++meanImageIt) { - ImageType::PixelType randomPixel = vnl_sample_normal(0, 1); + ImageType::PixelType randomPixel = randomNumberDistribution(randomNumberEngine); meanImageIt.Set(randomPixel); } @@ -99,7 +101,7 @@ TEST(PCAShapeSignedDistanceFunction, Test) for (pcImageIts[i].GoToBegin(); !pcImageIts[i].IsAtEnd(); ++pcImageIts[i]) { - ImageType::PixelType randomPixel = vnl_sample_normal(0, 1); + ImageType::PixelType randomPixel = randomNumberDistribution(randomNumberEngine); pcImageIts[i].Set(randomPixel); } } @@ -112,7 +114,7 @@ TEST(PCAShapeSignedDistanceFunction, Test) for (unsigned int i = 0; i < NumberOfPCs; ++i) { - pcStandardDeviations[i] = vnl_sample_normal(0, 1); + pcStandardDeviations[i] = randomNumberDistribution(randomNumberEngine); } shape->SetPrincipalComponentStandardDeviations(pcStandardDeviations); @@ -126,7 +128,7 @@ TEST(PCAShapeSignedDistanceFunction, Test) for (unsigned int i = 0; i < numberOfParameters; ++i) { - parameters[i] = vnl_sample_normal(0, 1); + parameters[i] = randomNumberDistribution(randomNumberEngine); } shape->SetParameters(parameters);