Skip to content

Commit e9de4b1

Browse files
committed
ENH: manual syncing with the performance branch
using beyond compare The commits from the performance branch were too intertwined with code not ready for releasing via the trunk. Therefore we could not use the merge functionality. Most important changes are: - moved the displacement distribution code to the Common directory - Added multi-threading to the displacement distribution code - Added an option to compute the exact metric value every few iterations (nice for evaluation purposes)
1 parent a453fd8 commit e9de4b1

16 files changed

+1688
-1123
lines changed

src/Common/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ set( CommonFiles
2525
itkAdvancedLinearInterpolateImageFunction.hxx
2626
itkAdvancedRayCastInterpolateImageFunction.h
2727
itkAdvancedRayCastInterpolateImageFunction.hxx
28+
itkComputeDisplacementDistribution.h
29+
itkComputeDisplacementDistribution.hxx
30+
itkComputeJacobianTerms.h
31+
itkComputeJacobianTerms.hxx
2832
itkGenericMultiResolutionPyramidImageFilter.h
2933
itkGenericMultiResolutionPyramidImageFilter.hxx
3034
itkImageFileCastWriter.h

src/Common/Transforms/itkGridScheduleComputer.hxx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,7 @@ GridScheduleComputer< TTransformScalarType, VImageDimension >
146146
for( unsigned int dim = 0; dim < Dimension; ++dim )
147147
{
148148
/** Compute the grid spacings. */
149-
double gridSpacing
150-
= finalGridSpacing[ dim ] * this->m_GridSpacingFactors[ res ][ dim ];
149+
double gridSpacing = finalGridSpacing[ dim ] * this->m_GridSpacingFactors[ res ][ dim ];
151150
this->m_GridSpacings[ res ][ dim ] = gridSpacing;
152151

153152
/** Compute the grid size without the extra grid points at the edges. */
Lines changed: 238 additions & 165 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)