Skip to content

Commit 7dab10c

Browse files
N-DekkerN-Dekker
committed
ENH: Remove .000000 from parameter txt, update GridSpacingSchedule
When running "ITK_Example02_CustomOrMultipleParameterMaps.ipynb", the WriteParameterFile calls no longer produces such trailing `.000000` on floating point parameter values. This is because of the improved way elastix writes floating points: pull request SuperElastix/elastix#934 commit SuperElastix/elastix@5c450b6, "ENH: `WriteParameterFile` write floating points without rounding errors", merged on Jul 12, 2023. Updated GridSpacingSchedule values, following elastix pull request SuperElastix/elastix#1361 commit SuperElastix/elastix@6f031a5 "ENH: Reduce rounding errors "GridSpacingSchedule" GetDefaultParameterMap"
1 parent c1db308 commit 7dab10c

File tree

5 files changed

+39
-39
lines changed

5 files changed

+39
-39
lines changed

‎examples/exampleoutput/Parameters.0.txt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
(AutomaticParameterEstimation "true")
22
(AutomaticScalesEstimation "true")
33
(CheckNumberOfSamples "true")
4-
(DefaultPixelValue 0.000000)
5-
(FinalBSplineInterpolationOrder 3.000000)
4+
(DefaultPixelValue 0)
5+
(FinalBSplineInterpolationOrder 3)
66
(FixedImagePyramid "FixedSmoothingImagePyramid")
77
(ImageSampler "RandomCoordinate")
88
(Interpolator "LinearInterpolator")
9-
(MaximumNumberOfIterations 256.000000)
10-
(MaximumNumberOfSamplingAttempts 8.000000)
9+
(MaximumNumberOfIterations 256)
10+
(MaximumNumberOfSamplingAttempts 8)
1111
(Metric "AdvancedMattesMutualInformation")
1212
(MovingImagePyramid "MovingSmoothingImagePyramid")
1313
(NewSamplesEveryIteration "true")
14-
(NumberOfResolutions 3.000000)
15-
(NumberOfSamplesForExactGradient 4096.000000)
16-
(NumberOfSpatialSamples 2048.000000)
14+
(NumberOfResolutions 3)
15+
(NumberOfSamplesForExactGradient 4096)
16+
(NumberOfSpatialSamples 2048)
1717
(Optimizer "AdaptiveStochasticGradientDescent")
1818
(Registration "MultiResolutionRegistration")
1919
(ResampleInterpolator "FinalBSplineInterpolator")

‎examples/exampleoutput/Parameters.1.txt‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
(AutomaticParameterEstimation "true")
22
(CheckNumberOfSamples "true")
3-
(DefaultPixelValue 0.000000)
4-
(FinalBSplineInterpolationOrder 3.000000)
3+
(DefaultPixelValue 0)
4+
(FinalBSplineInterpolationOrder 3)
55
(FinalGridSpacingInPhysicalUnits 20.000000)
66
(FixedImagePyramid "FixedSmoothingImagePyramid")
7-
(GridSpacingSchedule 1.988100 1.410000 1.000000)
7+
(GridSpacingSchedule 2 1.4142135623730951 1)
88
(ImageSampler "RandomCoordinate")
99
(Interpolator "LinearInterpolator")
10-
(MaximumNumberOfIterations 256.000000)
11-
(MaximumNumberOfSamplingAttempts 8.000000)
10+
(MaximumNumberOfIterations 256)
11+
(MaximumNumberOfSamplingAttempts 8)
1212
(Metric "AdvancedMattesMutualInformation" "TransformBendingEnergyPenalty")
13-
(Metric0Weight 1.000000)
14-
(Metric1Weight 1.000000)
13+
(Metric0Weight 1.0)
14+
(Metric1Weight 1.0)
1515
(MovingImagePyramid "MovingSmoothingImagePyramid")
1616
(NewSamplesEveryIteration "true")
17-
(NumberOfResolutions 3.000000)
18-
(NumberOfSamplesForExactGradient 4096.000000)
19-
(NumberOfSpatialSamples 2048.000000)
17+
(NumberOfResolutions 3)
18+
(NumberOfSamplesForExactGradient 4096)
19+
(NumberOfSpatialSamples 2048)
2020
(Optimizer "AdaptiveStochasticGradientDescent")
2121
(Registration "MultiMetricMultiResolutionRegistration")
2222
(ResampleInterpolator "FinalBSplineInterpolator")

‎examples/exampleoutput/Parameters.2.txt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
(BSplineInterpolationOrder 1.000000)
2-
(DefaultPixelValue 0.000000)
1+
(BSplineInterpolationOrder 1)
2+
(DefaultPixelValue 0)
33
(ErodeMask "false")
4-
(FinalBSplineInterpolationOrder 3.000000)
5-
(FinalGridSpacingInPhysicalUnits 16.000000)
4+
(FinalBSplineInterpolationOrder 3)
5+
(FinalGridSpacingInPhysicalUnits 16)
66
(FixedImagePyramid "FixedRecursiveImagePyramid")
77
(FixedInternalImagePixelType "float")
88
(HowToCombineTransforms "Compose")
99
(ImageSampler "Random")
1010
(Interpolator "BSplineInterpolator")
11-
(MaximumNumberOfIterations 500.000000)
11+
(MaximumNumberOfIterations 500)
1212
(Metric "AdvancedMattesMutualInformation")
1313
(MovingImagePyramid "MovingRecursiveImagePyramid")
1414
(MovingInternalImagePixelType "float")
1515
(NewSamplesEveryIteration "true")
16-
(NumberOfHistogramBins 32.000000)
17-
(NumberOfResolutions 1.000000)
18-
(NumberOfSpatialSamples 2048.000000)
16+
(NumberOfHistogramBins 32)
17+
(NumberOfResolutions 1)
18+
(NumberOfSpatialSamples 2048)
1919
(Optimizer "AdaptiveStochasticGradientDescent")
2020
(Registration "MultiResolutionRegistration")
2121
(ResampleInterpolator "FinalBSplineInterpolator")

‎examples/exampleoutput/Parameters.3.txt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
(AutomaticParameterEstimation "true")
22
(AutomaticScalesEstimation "true")
33
(CheckNumberOfSamples "true")
4-
(DefaultPixelValue 0.000000)
5-
(FinalBSplineInterpolationOrder 3.000000)
4+
(DefaultPixelValue 0)
5+
(FinalBSplineInterpolationOrder 3)
66
(FixedImagePyramid "FixedSmoothingImagePyramid")
77
(ImageSampler "RandomCoordinate")
88
(Interpolator "LinearInterpolator")
9-
(MaximumNumberOfIterations 256.000000)
10-
(MaximumNumberOfSamplingAttempts 8.000000)
9+
(MaximumNumberOfIterations 256)
10+
(MaximumNumberOfSamplingAttempts 8)
1111
(Metric "AdvancedMattesMutualInformation")
1212
(MovingImagePyramid "MovingSmoothingImagePyramid")
1313
(NewSamplesEveryIteration "true")
14-
(NumberOfResolutions 4.000000)
15-
(NumberOfSamplesForExactGradient 4096.000000)
16-
(NumberOfSpatialSamples 2048.000000)
14+
(NumberOfResolutions 4)
15+
(NumberOfSamplesForExactGradient 4096)
16+
(NumberOfSpatialSamples 2048)
1717
(Optimizer "AdaptiveStochasticGradientDescent")
1818
(Registration "MultiResolutionRegistration")
1919
(ResampleInterpolator "FinalBSplineInterpolator")

‎examples/exampleoutput/parameters_custom.txt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
(AutomaticParameterEstimation "true")
22
(AutomaticScalesEstimation "true")
33
(CheckNumberOfSamples "true")
4-
(DefaultPixelValue 0.000000)
5-
(FinalBSplineInterpolationOrder 3.000000)
4+
(DefaultPixelValue 0)
5+
(FinalBSplineInterpolationOrder 3)
66
(FixedImagePyramid "FixedSmoothingImagePyramid")
77
(ImageSampler "RandomCoordinate")
88
(Interpolator "LinearInterpolator")
9-
(MaximumNumberOfIterations 256.000000)
10-
(MaximumNumberOfSamplingAttempts 8.000000)
9+
(MaximumNumberOfIterations 256)
10+
(MaximumNumberOfSamplingAttempts 8)
1111
(Metric "AdvancedMattesMutualInformation")
1212
(MovingImagePyramid "MovingSmoothingImagePyramid")
1313
(NewSamplesEveryIteration "true")
14-
(NumberOfResolutions 4.000000)
15-
(NumberOfSamplesForExactGradient 4096.000000)
16-
(NumberOfSpatialSamples 2048.000000)
14+
(NumberOfResolutions 4)
15+
(NumberOfSamplesForExactGradient 4096)
16+
(NumberOfSpatialSamples 2048)
1717
(Optimizer "AdaptiveStochasticGradientDescent")
1818
(Registration "MultiResolutionRegistration")
1919
(ResampleInterpolator "FinalBSplineInterpolator")

0 commit comments

Comments
 (0)