tests of modified interpolator and regularstep gradient descent

Author: richardbeare

examples/CMakeLists.txt

@@ -16,3 +16,6 @@ include(${ITK_USE_FILE})
 
 add_executable(MinimalPathExamples example.cxx)
 target_link_libraries(MinimalPathExamples ${ITK_LIBRARIES})
+
+add_executable(interptest interpolator.cxx)
+target_link_libraries(interptest ${ITK_LIBRARIES})

test/CMakeLists.txt

@@ -216,6 +216,20 @@ add_test(
     0.25
     0.5
 )
+
+add_test(
+  NAME MinimalPathExtraction_Real_DSA_01_01_RegularStepGradientDescentShort
+  COMMAND MinimalPathExtractionTestDriver
+    --compare ${TESTING_OUTPUT_PATH}/Real-DSA-01-01-RegularStepGradientDescent.png ${BASELINE_DIR}/Real-DSA-01-01-RegularStepGradientDescent.png
+    Test_SpeedToPath_RegularStepGradientDescent_2D
+    ${TESTING_OUTPUT_PATH}/Real-DSA-01-01-RegularStepGradientDescent.png
+    ${DATA_DIR}/Real-DSA-01-Speed-01.mhd
+    ${DATA_DIR}/Real-DSA-01_short.path
+    3.0
+    4000
+    0.25
+    0.5
+)
 #Real-DSA-01-02
 add_test(
   NAME MinimalPathExtraction_Real_DSA_01_02_NeighborhoodIterate
@@ -426,6 +440,20 @@ add_test(
     0.01
 )
 
+add_test(
+  NAME MinimalPathExtraction_Synthetic_01_B_RegularStepGradientDescent_sp
+  COMMAND MinimalPathExtractionTestDriver
+    --compare ${TESTING_OUTPUT_PATH}/Synthetic-01-B-GradientDescent-sp.png ${BASELINE_DIR}/Synthetic-01-B-GradientDescent-sp.png
+    Test_SpeedToPath_RegularStepGradientDescent_2D
+    ${TESTING_OUTPUT_PATH}/Synthetic-01-B-GradientDescent-sp.png
+    ${DATA_DIR}/Synthetic-01-sp-Speed.mhd
+    ${DATA_DIR}/Synthetic-01-B-sp.path
+    0.01
+    3000
+    0.005
+    0.001
+)
+
 add_test(
   NAME MinimalPathExtraction_Synthetic_01_C_GradientDescent_sp
   COMMAND MinimalPathExtractionTestDriver

test/MinimalPathTest.h

@@ -289,7 +289,6 @@ int Test_SpeedToPath_GradientDescent_ND(int argc, char* argv[])
         pathFilter->Update( );
         time.Stop( );
         std::cout << std::setprecision(3) << "Path computed in: " << time.GetMean() << " seconds" << std::endl;
-
         // Allocate output image
         typename OutputImageType::Pointer output = OutputImageType::New();
         output->SetRegions( speed->GetLargestPossibleRegion() );
@@ -399,7 +398,8 @@ int Test_SpeedToPath_RegularStepGradientDescent_ND(int argc, char* argv[])
             if (spacing[dim] < minspacing) minspacing = spacing[dim];
 
         // Create Interpolator
-        using InterpolatorType = itk::LinearInterpolateImageFunction<ImageType, CoordRepType>;
+	using InterpolatorType = itk::LinearInterpolateSelectedNeighborsImageFunction<ImageType, CoordRepType, ValidNeighbor<typename PathFilterType::InputImagePixelType> >;
+        //using InterpolatorType = itk::LinearInterpolateImageFunction<ImageType, CoordRepType>;
         typename InterpolatorType::Pointer interp = InterpolatorType::New();
 
         // Create Cost Function