ENH: Add option to access index in point set registration

- Add superclass to PointSetToPointSetMetricv4 to permit index based access in GetLocalNeighborhodXXX methods. - Fix python wrapping.
mseng10 · Mar 13, 2021 · b6a142a · b6a142a
1 parent 2b34388
commit b6a142a
Show file tree

Hide file tree

Showing 12 changed files with 1,256 additions and 944 deletions.
diff --git a/Modules/Numerics/Optimizersv4/include/itkRegularStepGradientDescentOptimizerv4.h b/Modules/Numerics/Optimizersv4/include/itkRegularStepGradientDescentOptimizerv4.h
@@ -43,7 +43,7 @@ namespace itk
  *
  * \ingroup ITKOptimizersv4
  */
-template <typename TInternalComputationValueType>
+template <typename TInternalComputationValueType = double>
 class ITK_TEMPLATE_EXPORT RegularStepGradientDescentOptimizerv4
   : public GradientDescentOptimizerv4Template<TInternalComputationValueType>
 {

diff --git a/Modules/Registration/Metricsv4/include/itkPointSetToPointSetMetricWithIndexv4.h b/Modules/Registration/Metricsv4/include/itkPointSetToPointSetMetricWithIndexv4.h
diff --git a/Modules/Registration/Metricsv4/include/itkPointSetToPointSetMetricWithIndexv4.hxx b/Modules/Registration/Metricsv4/include/itkPointSetToPointSetMetricWithIndexv4.hxx
diff --git a/Modules/Registration/Metricsv4/include/itkPointSetToPointSetMetricv4.h b/Modules/Registration/Metricsv4/include/itkPointSetToPointSetMetricv4.h
diff --git a/Modules/Registration/Metricsv4/include/itkPointSetToPointSetMetricv4.hxx b/Modules/Registration/Metricsv4/include/itkPointSetToPointSetMetricv4.hxx
diff --git a/Modules/Registration/Metricsv4/wrapping/itkEuclideanDistancePointSetToPointSetMetric.wrap b/Modules/Registration/Metricsv4/wrapping/itkEuclideanDistancePointSetToPointSetMetric.wrap
@@ -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} >")

diff --git a/Modules/Registration/Metricsv4/wrapping/itkExpectationBasedPointSetToPointSetMetricv4.wrap b/Modules/Registration/Metricsv4/wrapping/itkExpectationBasedPointSetToPointSetMetricv4.wrap
@@ -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} >")

diff --git a/...istration/Metricsv4/wrapping/itkJensenHavrdaCharvatTsallisPointSetToPointSetMetricv4.wrap b/...istration/Metricsv4/wrapping/itkJensenHavrdaCharvatTsallisPointSetToPointSetMetricv4.wrap
@@ -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} >")

diff --git a/Modules/Registration/Metricsv4/wrapping/itkLabeledPointSetToPointSetMetricv4.wrap b/Modules/Registration/Metricsv4/wrapping/itkLabeledPointSetToPointSetMetricv4.wrap
@@ -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} >")

diff --git a/Modules/Registration/Metricsv4/wrapping/itkPointSetToPointSetMetricWithIndexv4.wrap b/Modules/Registration/Metricsv4/wrapping/itkPointSetToPointSetMetricWithIndexv4.wrap
@@ -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()
diff --git a/Modules/Registration/Metricsv4/wrapping/itkPointSetToPointSetMetricv4.wrap b/Modules/Registration/Metricsv4/wrapping/itkPointSetToPointSetMetricv4.wrap
@@ -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()
diff --git a/Modules/Registration/RegistrationMethodsv4/include/itkImageRegistrationMethodv4.h b/Modules/Registration/RegistrationMethodsv4/include/itkImageRegistrationMethodv4.h
@@ -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"
@@ -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;