Merge pull request #9 from dzenanz/rigidTests

InsightSoftwareConsortium · Jan 29, 2024 · 3f40a6d · 3f40a6d
2 parents 203b5d4 + a6417df
commit 3f40a6d
Show file tree

Hide file tree

Showing 10 changed files with 74 additions and 3 deletions.
diff --git a/include/itkANTSRegistration.hxx b/include/itkANTSRegistration.hxx
@@ -288,7 +288,7 @@ ANTSRegistration<TFixedImage, TMovingImage, TParametersValueType>::GenerateData(
     }
     break;
     default:
-      itkExceptionMacro(<< "Unsupported transform type: " << whichTransform);
+      itkExceptionMacro(<< "Unsupported transform type: " << this->GetTypeOfTransform());
   }
 
   // set the vector-vector parameters

diff --git a/test/Baseline/antsRegistrationTest_AffineTranslationNoMasks.result.nii.gz.cid b/test/Baseline/antsRegistrationTest_AffineTranslationNoMasks.result.nii.gz.cid
@@ -0,0 +1 @@
+bafkreibhqtvznxbhf72l2hba6emdnmfdvwxjm4lxqxjdsyee4pjpd3aypy
diff --git a/test/Baseline/antsRegistrationTest_RigidRotationHeadMasks.result.nii.gz.cid b/test/Baseline/antsRegistrationTest_RigidRotationHeadMasks.result.nii.gz.cid
@@ -0,0 +1 @@
+bafkreicui7753dmitb7blhst3dpeagdsxekrjjdykqeh4ovedvz2tsgxe4
diff --git a/test/Baseline/antsRegistrationTest_RigidRotationNoMasks.result.nii.gz.cid b/test/Baseline/antsRegistrationTest_RigidRotationNoMasks.result.nii.gz.cid
@@ -0,0 +1 @@
+bafkreicui7753dmitb7blhst3dpeagdsxekrjjdykqeh4ovedvz2tsgxe4
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -30,6 +30,7 @@ itk_add_test(NAME antsRegistrationTest_AffineRotationMasks
     DATA{Input/test_mask.nii.gz}  # fixedMask
     DATA{Input/rotation.test_mask.nii.gz}  # movingMask
     0.001  # (minimum?) StepLength
+    Affine
   )
 
 itk_add_test(NAME antsRegistrationTest_AffineRotationNoMasks
@@ -49,6 +50,7 @@ itk_add_test(NAME antsRegistrationTest_AffineRotationNoMasks
     none  # fixedMask
     none  # movingMask
     0.001  # (minimum?) StepLength
+    Affine
   )
 
 itk_add_test(NAME antsRegistrationTest_AffineScaleMasks
@@ -68,6 +70,7 @@ itk_add_test(NAME antsRegistrationTest_AffineScaleMasks
     DATA{Input/test_mask.nii.gz}  # fixedMask
     DATA{Input/scale.test_mask.nii.gz}  # movingMask
     0.001  # (minimum?) StepLength
+    Affine
   )
 
 itk_add_test(NAME antsRegistrationTest_AffineScaleNoMasks
@@ -87,4 +90,65 @@ itk_add_test(NAME antsRegistrationTest_AffineScaleNoMasks
     none  # fixedMask
     none  # movingMask
     0.001  # (minimum?) StepLength
+    Affine
+  )
+
+itk_add_test(NAME antsRegistrationTest_AffineTranslationNoMasks
+  COMMAND ANTsWasmTestDriver
+    --compare
+    DATA{Baseline/antsRegistrationTest_AffineTranslationNoMasks.result.nii.gz}
+    ${ITK_TEST_OUTPUT_DIR}/antsRegistrationTest_AffineTranslationNoMasks.result.nii.gz
+    --compareIntensityTolerance 7
+    --compareRadiusTolerance 0
+    --compareNumberOfPixelsTolerance 777
+  itkANTSRegistrationTest
+    DATA{Input/test.nii.gz}  # fixed image
+    DATA{Input/translation.test.nii.gz}  # moving image
+    ${ITK_TEST_OUTPUT_DIR}/antsRegistrationTest_AffineTranslationNoMasks.tfm  # output transform
+    ${ITK_TEST_OUTPUT_DIR}/antsRegistrationTest_AffineTranslationNoMasks.result.nii.gz  # moving image warped to fixed space
+    DATA{Input/Initializer_antsRegistrationTest_AffineTranslationMasks.mat}  # initial transform
+    none  # fixedMask
+    none  # movingMask
+    0.001  # (minimum?) StepLength
+    Affine
+  )
+
+itk_add_test(NAME antsRegistrationTest_RigidRotationHeadMasks
+  COMMAND ANTsWasmTestDriver
+    --compare
+    DATA{Baseline/antsRegistrationTest_RigidRotationHeadMasks.result.nii.gz}
+    ${ITK_TEST_OUTPUT_DIR}/antsRegistrationTest_RigidRotationHeadMasks.result.nii.gz
+    --compareIntensityTolerance 7
+    --compareRadiusTolerance 1
+    --compareNumberOfPixelsTolerance 777
+  itkANTSRegistrationTest
+    DATA{Input/test.nii.gz}  # fixed image
+    DATA{Input/rotation.test.nii.gz}  # moving image
+    ${ITK_TEST_OUTPUT_DIR}/antsRegistrationTest_RigidRotationHeadMasks.tfm  # output transform
+    ${ITK_TEST_OUTPUT_DIR}/antsRegistrationTest_RigidRotationHeadMasks.result.nii.gz  # moving image warped to fixed space
+    DATA{Input/Initializer_0.05_antsRegistrationTest_RigidRotationHeadMasks.mat}  # initial transform
+    none  # fixedMask
+    none  # movingMask
+    0.001  # (minimum?) StepLength
+    Rigid
+  )
+
+itk_add_test(NAME antsRegistrationTest_RigidRotationNoMasks
+  COMMAND ANTsWasmTestDriver
+    --compare
+    DATA{Baseline/antsRegistrationTest_RigidRotationNoMasks.result.nii.gz}
+    ${ITK_TEST_OUTPUT_DIR}/antsRegistrationTest_RigidRotationNoMasks.result.nii.gz
+    --compareIntensityTolerance 7
+    --compareRadiusTolerance 1
+    --compareNumberOfPixelsTolerance 777
+  itkANTSRegistrationTest
+    DATA{Input/test.nii.gz}  # fixed image
+    DATA{Input/rotation.test.nii.gz}  # moving image
+    ${ITK_TEST_OUTPUT_DIR}/antsRegistrationTest_RigidRotationNoMasks.tfm  # output transform
+    ${ITK_TEST_OUTPUT_DIR}/antsRegistrationTest_RigidRotationNoMasks.result.nii.gz  # moving image warped to fixed space
+    DATA{Input/Initializer_0.05_antsRegistrationTest_RigidRotationNoMasks.mat}  # initial transform
+    none  # fixedMask
+    none  # movingMask
+    0.001  # (minimum?) StepLength
+    Rigid
   )
diff --git a/test/Input/Initializer_0.05_antsRegistrationTest_RigidRotationHeadMasks.mat b/test/Input/Initializer_0.05_antsRegistrationTest_RigidRotationHeadMasks.mat
diff --git a/test/Input/Initializer_0.05_antsRegistrationTest_RigidRotationNoMasks.mat b/test/Input/Initializer_0.05_antsRegistrationTest_RigidRotationNoMasks.mat
diff --git a/test/Input/Initializer_antsRegistrationTest_AffineTranslationMasks.mat b/test/Input/Initializer_antsRegistrationTest_AffineTranslationMasks.mat
diff --git a/test/Input/translation.test.nii.gz.cid b/test/Input/translation.test.nii.gz.cid
@@ -0,0 +1 @@
+bafkreid4leeonupjqnmqdbpjsyee4dcughyowd2zgktgv57mgx2hj75oae
diff --git a/test/itkANTSRegistrationTest.cxx b/test/itkANTSRegistrationTest.cxx
@@ -106,10 +106,13 @@ doTest(int argc, char * argv[])
     double gradientStep = std::stod(argv[8]);
     filter->SetGradientStep(gradientStep);
   }
+  if (argc > 9)
+  {
+    filter->SetTypeOfTransform(argv[9]);
+  }
 
   filter->SetFixedImage(fixedImage);
   filter->SetMovingImage(movingImage);
-  filter->SetTypeOfTransform("Affine");
   ITK_TRY_EXPECT_NO_EXCEPTION(filter->Update());
 
   // debug
@@ -143,7 +146,7 @@ itkANTSRegistrationTest(int argc, char * argv[])
     std::cerr << " fixedImage movingImage outTransform";
     std::cerr << " [outMovingResampledToFixedSpace] [initialTransform]";
     std::cerr << " [fixedImageMask] [movingImageMask]";
-    std::cerr << " [gradientStep]";
+    std::cerr << " [gradientStep] [typeOfTransform]";
     std::cerr << std::endl;
     return EXIT_FAILURE;
   }