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

Jump to bottom

Just pass the image size to SetRegions calls, no need to construct an ImageRegion object #1193

Merged
merged 2 commits into from
Jul 9, 2024
Merged

Just pass the image size to SetRegions calls, no need to construct an ImageRegion object #1193

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
381dffa
STYLE: ParzenWindowHistogram metric: just pass size to `SetRegions`
N-Dekker Jul 9, 2024
114a022
STYLE: DistancePreservingRigidity metric: just pass size to `SetRegions`
N-Dekker Jul 9, 2024
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
78 changes: 20 additions & 58 deletions Common/CostFunctions/itkParzenWindowHistogramImageToImageMetric.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,15 +196,7 @@ ParzenWindowHistogramImageToImageMetric<TFixedImage, TMovingImage>::InitializeHi
* the first dimension.
*/
this->m_JointPDF = JointPDFType::New();
JointPDFRegionType jointPDFRegion;
JointPDFIndexType jointPDFIndex;
JointPDFSizeType jointPDFSize;
jointPDFIndex.Fill(0);
jointPDFSize[0] = this->m_NumberOfMovingHistogramBins;
jointPDFSize[1] = this->m_NumberOfFixedHistogramBins;
jointPDFRegion.SetIndex(jointPDFIndex);
jointPDFRegion.SetSize(jointPDFSize);
this->m_JointPDF->SetRegions(jointPDFRegion);
this->m_JointPDF->SetRegions(JointPDFSizeType{ m_NumberOfMovingHistogramBins, m_NumberOfFixedHistogramBins });
this->m_JointPDF->Allocate();

if (this->GetUseDerivative())
Expand All @@ -218,57 +210,36 @@ ParzenWindowHistogramImageToImageMetric<TFixedImage, TMovingImage>::InitializeHi
* the same size happens to be valid.
*/

JointPDFDerivativesRegionType jointPDFDerivativesRegion;
JointPDFDerivativesIndexType jointPDFDerivativesIndex;
JointPDFDerivativesSizeType jointPDFDerivativesSize;
jointPDFDerivativesIndex.Fill(0);
jointPDFDerivativesSize[0] = this->GetNumberOfParameters();
jointPDFDerivativesSize[1] = this->m_NumberOfMovingHistogramBins;
jointPDFDerivativesSize[2] = this->m_NumberOfFixedHistogramBins;
jointPDFDerivativesRegion.SetIndex(jointPDFDerivativesIndex);
jointPDFDerivativesRegion.SetSize(jointPDFDerivativesSize);
const JointPDFDerivativesSizeType jointPDFDerivativesSize{ this->GetNumberOfParameters(),
m_NumberOfMovingHistogramBins,
m_NumberOfFixedHistogramBins };

if (this->GetUseFiniteDifferenceDerivative())
{
this->m_JointPDFDerivatives = nullptr;

this->m_IncrementalJointPDFRight = JointPDFDerivativesType::New();
this->m_IncrementalJointPDFLeft = JointPDFDerivativesType::New();
this->m_IncrementalJointPDFRight->SetRegions(jointPDFDerivativesRegion);
this->m_IncrementalJointPDFLeft->SetRegions(jointPDFDerivativesRegion);
this->m_IncrementalJointPDFRight->SetRegions(jointPDFDerivativesSize);
this->m_IncrementalJointPDFLeft->SetRegions(jointPDFDerivativesSize);
this->m_IncrementalJointPDFRight->Allocate();
this->m_IncrementalJointPDFLeft->Allocate();

/** Also initialize the incremental marginal pdfs. */
IncrementalMarginalPDFRegionType fixedIMPDFRegion;
IncrementalMarginalPDFIndexType fixedIMPDFIndex;
IncrementalMarginalPDFSizeType fixedIMPDFSize;

IncrementalMarginalPDFRegionType movingIMPDFRegion;
IncrementalMarginalPDFIndexType movingIMPDFIndex;
IncrementalMarginalPDFSizeType movingIMPDFSize;

fixedIMPDFIndex.Fill(0);
fixedIMPDFSize[0] = this->GetNumberOfParameters();
fixedIMPDFSize[1] = this->m_NumberOfFixedHistogramBins;
fixedIMPDFRegion.SetSize(fixedIMPDFSize);
fixedIMPDFRegion.SetIndex(fixedIMPDFIndex);

movingIMPDFIndex.Fill(0);
movingIMPDFSize[0] = this->GetNumberOfParameters();
movingIMPDFSize[1] = this->m_NumberOfMovingHistogramBins;
movingIMPDFRegion.SetSize(movingIMPDFSize);
movingIMPDFRegion.SetIndex(movingIMPDFIndex);
const IncrementalMarginalPDFSizeType fixedIMPDFSize{ this->GetNumberOfParameters(),
m_NumberOfFixedHistogramBins };
const IncrementalMarginalPDFSizeType movingIMPDFSize{ this->GetNumberOfParameters(),
m_NumberOfMovingHistogramBins };

this->m_FixedIncrementalMarginalPDFRight = IncrementalMarginalPDFType::New();
this->m_MovingIncrementalMarginalPDFRight = IncrementalMarginalPDFType::New();
this->m_FixedIncrementalMarginalPDFLeft = IncrementalMarginalPDFType::New();
this->m_MovingIncrementalMarginalPDFLeft = IncrementalMarginalPDFType::New();

this->m_FixedIncrementalMarginalPDFRight->SetRegions(fixedIMPDFRegion);
this->m_MovingIncrementalMarginalPDFRight->SetRegions(movingIMPDFRegion);
this->m_FixedIncrementalMarginalPDFLeft->SetRegions(fixedIMPDFRegion);
this->m_MovingIncrementalMarginalPDFLeft->SetRegions(movingIMPDFRegion);
this->m_FixedIncrementalMarginalPDFRight->SetRegions(fixedIMPDFSize);
this->m_MovingIncrementalMarginalPDFRight->SetRegions(movingIMPDFSize);
this->m_FixedIncrementalMarginalPDFLeft->SetRegions(fixedIMPDFSize);
this->m_MovingIncrementalMarginalPDFLeft->SetRegions(movingIMPDFSize);

this->m_FixedIncrementalMarginalPDFRight->Allocate();
this->m_MovingIncrementalMarginalPDFRight->Allocate();
Expand All @@ -283,7 +254,7 @@ ParzenWindowHistogramImageToImageMetric<TFixedImage, TMovingImage>::InitializeHi
this->m_IncrementalJointPDFLeft = nullptr;

this->m_JointPDFDerivatives = JointPDFDerivativesType::New();
this->m_JointPDFDerivatives->SetRegions(jointPDFDerivativesRegion);
this->m_JointPDFDerivatives->SetRegions(jointPDFDerivativesSize);
this->m_JointPDFDerivatives->Allocate();
}
else
Expand All @@ -292,9 +263,7 @@ ParzenWindowHistogramImageToImageMetric<TFixedImage, TMovingImage>::InitializeHi
// \todo Should not be allocated in the first place
if (!this->m_JointPDFDerivatives.IsNull())
{
jointPDFDerivativesSize.Fill(0);
jointPDFDerivativesRegion.SetSize(jointPDFDerivativesSize);
this->m_JointPDFDerivatives->SetRegions(jointPDFDerivativesRegion);
this->m_JointPDFDerivatives->SetRegions(JointPDFDerivativesSizeType{});
this->m_JointPDFDerivatives->Allocate();
this->m_JointPDFDerivatives->GetPixelContainer()->Squeeze();
}
Expand Down Expand Up @@ -408,15 +377,8 @@ ParzenWindowHistogramImageToImageMetric<TFixedImage, TMovingImage>::InitializeTh
* which has performance benefits for larger vector sizes.
*/

/** Construct regions for the joint histograms. */
JointPDFRegionType jointPDFRegion;
JointPDFIndexType jointPDFIndex;
JointPDFSizeType jointPDFSize;
jointPDFIndex.Fill(0);
jointPDFSize[0] = this->m_NumberOfMovingHistogramBins;
jointPDFSize[1] = this->m_NumberOfFixedHistogramBins;
jointPDFRegion.SetIndex(jointPDFIndex);
jointPDFRegion.SetSize(jointPDFSize);
/** Construct region size for the joint histograms. */
const JointPDFSizeType jointPDFSize{ m_NumberOfMovingHistogramBins, m_NumberOfFixedHistogramBins };

const ThreadIdType numberOfThreads = Self::GetNumberOfWorkUnits();

Expand All @@ -434,9 +396,9 @@ ParzenWindowHistogramImageToImageMetric<TFixedImage, TMovingImage>::InitializeTh
{
jointPDF = JointPDFType::New();
}
if (jointPDF->GetLargestPossibleRegion() != jointPDFRegion)
if (jointPDF->GetLargestPossibleRegion() != JointPDFRegionType(jointPDFSize))
{
jointPDF->SetRegions(jointPDFRegion);
jointPDF->SetRegions(jointPDFSize);
jointPDF->Allocate();
}
}
Expand Down
5 changes: 1 addition & 4 deletions ...ts/Metrics/DistancePreservingRigidityPenalty/itkDistancePreservingRigidityPenaltyTerm.hxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,7 @@ DistancePreservingRigidityPenaltyTerm<TFixedImage, TScalarType>::Initialize()
bSplineKnotSpacing[1] = fixedParameters[7];
bSplineKnotSpacing[2] = fixedParameters[8];

typename FixedImageType::RegionType bSplineKnotRegion;
bSplineKnotRegion.SetSize(bSplineKnotSize);

this->m_BSplineKnotImage->SetRegions(bSplineKnotRegion);
this->m_BSplineKnotImage->SetRegions(bSplineKnotSize);
this->m_BSplineKnotImage->SetSpacing(bSplineKnotSpacing);
this->m_BSplineKnotImage->SetOrigin(bSplineKnotOrigin);
this->m_BSplineKnotImage->SetDirection(this->m_FixedImage->GetDirection());
Expand Down
Loading