Skip to content

ENH: Add option to access index in point set registration #2385

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

Merged
dzenanz merged 1 commit into from
Mar 13, 2021
Merged

ENH: Add option to access index in point set registration #2385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Modules/Numerics/Optimizersv4/include/itkRegularStepGradientDescentOptimizerv4.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ namespace itk
*
* \ingroup ITKOptimizersv4
*/
template <typename TInternalComputationValueType>
template <typename TInternalComputationValueType = double>
class ITK_TEMPLATE_EXPORT RegularStepGradientDescentOptimizerv4
: public GradientDescentOptimizerv4Template<TInternalComputationValueType>
{
Expand Down
484 changes: 484 additions & 0 deletions Modules/Registration/Metricsv4/include/itkPointSetToPointSetMetricWithIndexv4.h
View file
Open in desktop

Large diffs are not rendered by default.

697 changes: 697 additions & 0 deletions Modules/Registration/Metricsv4/include/itkPointSetToPointSetMetricWithIndexv4.hxx
View file
Open in desktop

Large diffs are not rendered by default.

328 changes: 44 additions & 284 deletions Modules/Registration/Metricsv4/include/itkPointSetToPointSetMetricv4.h
View file
Open in desktop

Large diffs are not rendered by default.

653 changes: 0 additions & 653 deletions Modules/Registration/Metricsv4/include/itkPointSetToPointSetMetricv4.hxx
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Modules/Registration/Metricsv4/wrapping/itkEuclideanDistancePointSetToPointSetMetric.wrap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ itk_wrap_include("itkDefaultStaticMeshTraits.h")

UNIQUE(types "${WRAP_ITK_SCALAR};D")

itk_wrap_class("itk::EuclideanDistancePointSetToPointSetMetricv4" POINTER_WITH_SUPERCLASS)
itk_wrap_class("itk::EuclideanDistancePointSetToPointSetMetricv4" POINTER_WITH_2_SUPERCLASSES)
foreach(d ${ITK_WRAP_IMAGE_DIMS})
foreach(t ${types})
itk_wrap_template("PS${ITKM_${t}}${d}" "itk::PointSet< ${ITKT_${t}},${d} >")
Expand Down
2 changes: 1 addition & 1 deletion Modules/Registration/Metricsv4/wrapping/itkExpectationBasedPointSetToPointSetMetricv4.wrap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ itk_wrap_include("itkDefaultStaticMeshTraits.h")

UNIQUE(types "${WRAP_ITK_SCALAR};D")

itk_wrap_class("itk::ExpectationBasedPointSetToPointSetMetricv4" POINTER)
itk_wrap_class("itk::ExpectationBasedPointSetToPointSetMetricv4" POINTER_WITH_2_SUPERCLASSES)
foreach(d ${ITK_WRAP_IMAGE_DIMS})
foreach(t ${types})
itk_wrap_template("PS${ITKM_${t}}${d}" "itk::PointSet< ${ITKT_${t}},${d} >")
Expand Down
2 changes: 1 addition & 1 deletion ...istration/Metricsv4/wrapping/itkJensenHavrdaCharvatTsallisPointSetToPointSetMetricv4.wrap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ itk_wrap_include("itkDefaultStaticMeshTraits.h")

UNIQUE(types "${WRAP_ITK_SCALAR};D")

itk_wrap_class("itk::JensenHavrdaCharvatTsallisPointSetToPointSetMetricv4" POINTER)
itk_wrap_class("itk::JensenHavrdaCharvatTsallisPointSetToPointSetMetricv4" POINTER_WITH_2_SUPERCLASSES)
foreach(d ${ITK_WRAP_IMAGE_DIMS})
foreach(t ${types})
itk_wrap_template("PS${ITKM_${t}}${d}" "itk::PointSet< ${ITKT_${t}},${d} >")
Expand Down
2 changes: 1 addition & 1 deletion Modules/Registration/Metricsv4/wrapping/itkLabeledPointSetToPointSetMetricv4.wrap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ itk_wrap_include("itkDefaultStaticMeshTraits.h")

UNIQUE(types "${WRAP_ITK_INT}")

itk_wrap_class("itk::LabeledPointSetToPointSetMetricv4" POINTER)
itk_wrap_class("itk::LabeledPointSetToPointSetMetricv4" POINTER_WITH_2_SUPERCLASSES)
foreach(d ${ITK_WRAP_IMAGE_DIMS})
foreach(t ${types})
itk_wrap_template("PS${ITKM_${t}}${d}" "itk::PointSet< ${ITKT_${t}},${d} >")
Expand Down
12 changes: 12 additions & 0 deletions Modules/Registration/Metricsv4/wrapping/itkPointSetToPointSetMetricWithIndexv4.wrap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
itk_wrap_include("itkPointSet.h")
itk_wrap_include("itkDefaultStaticMeshTraits.h")

UNIQUE(types "${WRAP_ITK_SCALAR};D")

itk_wrap_class("itk::PointSetToPointSetMetricWithIndexv4" POINTER_WITH_SUPERCLASS)
foreach(d ${ITK_WRAP_IMAGE_DIMS})
foreach(t ${types})
itk_wrap_template("PS${ITKM_${t}}${d}" "itk::PointSet< ${ITKT_${t}},${d} >")
endforeach()
endforeach()
itk_end_wrap_class()
12 changes: 12 additions & 0 deletions Modules/Registration/Metricsv4/wrapping/itkPointSetToPointSetMetricv4.wrap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
itk_wrap_include("itkPointSet.h")
itk_wrap_include("itkDefaultStaticMeshTraits.h")

UNIQUE(types "${WRAP_ITK_SCALAR};D")

itk_wrap_class("itk::PointSetToPointSetMetricv4" POINTER_WITH_2_SUPERCLASSES)
foreach(d ${ITK_WRAP_IMAGE_DIMS})
foreach(t ${types})
itk_wrap_template("PS${ITKM_${t}}${d}" "itk::PointSet< ${ITKT_${t}},${d} >")
endforeach()
endforeach()
itk_end_wrap_class()
4 changes: 2 additions & 2 deletions Modules/Registration/RegistrationMethodsv4/include/itkImageRegistrationMethodv4.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#include "itkObjectToObjectMultiMetricv4.h"
#include "itkObjectToObjectOptimizerBase.h"
#include "itkImageToImageMetricv4.h"
#include "itkPointSetToPointSetMetricv4.h"
#include "itkPointSetToPointSetMetricWithIndexv4.h"
#include "itkShrinkImageFilter.h"
#include "itkIdentityTransform.h"
#include "itkTransformParametersAdaptorBase.h"
Expand Down Expand Up @@ -173,7 +173,7 @@ class ITK_TEMPLATE_EXPORT ImageRegistrationMethodv4 : public ProcessObject

using MultiMetricType = ObjectToObjectMultiMetricv4<ImageDimension, ImageDimension, VirtualImageType, RealType>;
using ImageMetricType = ImageToImageMetricv4<FixedImageType, MovingImageType, VirtualImageType, RealType>;
using PointSetMetricType = PointSetToPointSetMetricv4<PointSetType, PointSetType, RealType>;
using PointSetMetricType = PointSetToPointSetMetricWithIndexv4<PointSetType, PointSetType, RealType>;

using FixedImageMaskType = typename ImageMetricType::FixedImageMaskType;
using FixedImageMaskConstPointer = typename FixedImageMaskType::ConstPointer;
Expand Down