Skip to content
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

Remove m_OptionalUserData members from ImageSamplers, make each UserData struct a simple aggregate #1014

Merged
merged 2 commits into from
Dec 15, 2023
Merged

Remove m_OptionalUserData members from ImageSamplers, make each UserData struct a simple aggregate #1014

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
13239bc
STYLE: Remove private `m_OptionalUserData` members from ImageSamplers
N-Dekker Dec 15, 2023
96a19d0
STYLE: Make each UserData `struct` of ImageSamplers a simple aggregate
N-Dekker Dec 15, 2023
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
13 changes: 0 additions & 13 deletions Common/ImageSamplers/itkImageRandomCoordinateSampler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@
#include "itkBSplineInterpolateImageFunction.h"
#include "itkMersenneTwisterRandomVariateGenerator.h"

#include <optional>

namespace itk
{

Expand Down Expand Up @@ -152,24 +150,13 @@ class ITK_TEMPLATE_EXPORT ImageRandomCoordinateSampler : public ImageRandomSampl
{
ITK_DISALLOW_COPY_AND_MOVE(UserData);

UserData(const std::vector<InputImageContinuousIndexType> & randomCoordinates,
const InputImageType & inputImage,
const InterpolatorType & interpolator,
std::vector<ImageSampleType> & samples)
: m_RandomCoordinates(randomCoordinates)
, m_InputImage(inputImage)
, m_Interpolator(interpolator)
, m_Samples(samples)
{}

const std::vector<InputImageContinuousIndexType> & m_RandomCoordinates;
const InputImageType & m_InputImage;
const InterpolatorType & m_Interpolator;
std::vector<ImageSampleType> & m_Samples;
};

std::vector<InputImageContinuousIndexType> m_RandomCoordinates{};
std::optional<UserData> m_OptionalUserData{};

static ITK_THREAD_RETURN_FUNCTION_CALL_CONVENTION
ThreaderCallback(void * arg);
Expand Down
4 changes: 2 additions & 2 deletions Common/ImageSamplers/itkImageRandomCoordinateSampler.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,10 @@ ImageRandomCoordinateSampler<TInputImage>::GenerateData()
m_RandomCoordinates.push_back(randomCIndex);
}

m_OptionalUserData.emplace(m_RandomCoordinates, inputImage, *interpolator, samples);
UserData userData{ m_RandomCoordinates, inputImage, *interpolator, samples };

MultiThreaderBase & multiThreader = elastix::Deref(this->ProcessObject::GetMultiThreader());
multiThreader.SetSingleMethod(&Self::ThreaderCallback, &*m_OptionalUserData);
multiThreader.SetSingleMethod(&Self::ThreaderCallback, &userData);
multiThreader.SingleMethodExecute();
return;
}
Expand Down
14 changes: 0 additions & 14 deletions Common/ImageSamplers/itkImageRandomSampler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
#define itkImageRandomSampler_h

#include "itkImageRandomSamplerBase.h"
#include <optional>

namespace itk
{
Expand Down Expand Up @@ -92,26 +91,13 @@ class ITK_TEMPLATE_EXPORT ImageRandomSampler : public ImageRandomSamplerBase<TIn
{
ITK_DISALLOW_COPY_AND_MOVE(UserData);

UserData(const std::vector<double> & randomNumberList,
const InputImageType & inputImage,
const InputImageRegionType & region,
std::vector<ImageSampleType> & samples)
: m_RandomNumberList(randomNumberList)
, m_InputImage(inputImage)
, m_RegionIndex(region.GetIndex())
, m_RegionSize(region.GetSize())
, m_Samples(samples)
{}

const std::vector<double> & m_RandomNumberList;
const InputImageType & m_InputImage;
InputImageIndexType m_RegionIndex{};
InputImageSizeType m_RegionSize{};
std::vector<ImageSampleType> & m_Samples;
};

std::optional<UserData> m_OptionalUserData{};

static ITK_THREAD_RETURN_FUNCTION_CALL_CONVENTION
ThreaderCallback(void * arg);
};
Expand Down
7 changes: 5 additions & 2 deletions Common/ImageSamplers/itkImageRandomSampler.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,13 @@ ImageRandomSampler<TInputImage>::GenerateData()
auto & samples = sampleContainer.CastToSTLContainer();
samples.resize(randomNumberList.size());

m_OptionalUserData.emplace(randomNumberList, inputImage, this->GetCroppedInputImageRegion(), samples);
const auto & croppedInputImageRegion = this->GetCroppedInputImageRegion();
UserData userData{
randomNumberList, inputImage, croppedInputImageRegion.GetIndex(), croppedInputImageRegion.GetSize(), samples
};

MultiThreaderBase & multiThreader = elastix::Deref(this->ProcessObject::GetMultiThreader());
multiThreader.SetSingleMethod(&Self::ThreaderCallback, &*m_OptionalUserData);
multiThreader.SetSingleMethod(&Self::ThreaderCallback, &userData);
multiThreader.SingleMethodExecute();
return;
}
Expand Down
12 changes: 1 addition & 11 deletions Common/ImageSamplers/itkImageRandomSamplerSparseMask.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
#include "itkImageRandomSamplerBase.h"
#include "itkMersenneTwisterRandomVariateGenerator.h"
#include "itkImageFullSampler.h"
#include <optional>

namespace itk
{
Expand Down Expand Up @@ -103,21 +102,12 @@ class ITK_TEMPLATE_EXPORT ImageRandomSamplerSparseMask : public ImageRandomSampl
{
ITK_DISALLOW_COPY_AND_MOVE(UserData);

UserData(const std::vector<ImageSampleType> & allValidSamples,
const std::vector<size_t> & randomIndices,
std::vector<ImageSampleType> & samples)
: m_AllValidSamples(allValidSamples)
, m_RandomIndices(randomIndices)
, m_Samples(samples)
{}

const std::vector<ImageSampleType> & m_AllValidSamples;
const std::vector<size_t> & m_RandomIndices;
std::vector<ImageSampleType> & m_Samples;
};

std::vector<size_t> m_RandomIndices{};
std::optional<UserData> m_OptionalUserData{};
std::vector<size_t> m_RandomIndices{};

static ITK_THREAD_RETURN_FUNCTION_CALL_CONVENTION
ThreaderCallback(void * arg);
Expand Down
4 changes: 2 additions & 2 deletions Common/ImageSamplers/itkImageRandomSamplerSparseMask.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,10 @@ ImageRandomSamplerSparseMask<TInputImage>::GenerateData()
auto & samples = sampleContainer.CastToSTLContainer();
samples.resize(m_RandomIndices.size());

m_OptionalUserData.emplace(allValidSamples.CastToSTLConstContainer(), m_RandomIndices, samples);
UserData userData{ allValidSamples.CastToSTLConstContainer(), m_RandomIndices, samples };

MultiThreaderBase & multiThreader = elastix::Deref(this->ProcessObject::GetMultiThreader());
multiThreader.SetSingleMethod(&Self::ThreaderCallback, &*m_OptionalUserData);
multiThreader.SetSingleMethod(&Self::ThreaderCallback, &userData);
multiThreader.SingleMethodExecute();
return;
}
Expand Down
Loading