From 1df7e447d37b9e847ca1e91fa36913a016721d2c Mon Sep 17 00:00:00 2001 From: Olivier Commowick Date: Mon, 11 Jul 2022 11:31:35 +0200 Subject: [PATCH] Correct ugly bug: many algorithmes were using correlation instead of squared correlation --- .../animaBMDistortionCorrection.cxx | 2 +- .../animaPyramidalDistortionCorrectionBlockMatchingBridge.h | 6 +++--- .../animaDenseSVFBMRegistration.cxx | 2 +- .../animaPyramidalDenseSVFMatchingBridge.h | 4 ++-- .../eddy_current_correction/animaEddyCurrentCorrection.cxx | 2 +- .../animaPyramidalBMRegistration.cxx | 2 +- .../animaPyramidalBlockMatchingBridge.h | 4 ++-- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Anima/registration/anatomical-commands/bm_distortion_correction/animaBMDistortionCorrection.cxx b/Anima/registration/anatomical-commands/bm_distortion_correction/animaBMDistortionCorrection.cxx index e21cdaac6..93142ffec 100644 --- a/Anima/registration/anatomical-commands/bm_distortion_correction/animaBMDistortionCorrection.cxx +++ b/Anima/registration/anatomical-commands/bm_distortion_correction/animaBMDistortionCorrection.cxx @@ -37,7 +37,7 @@ int main(int argc, const char** argv) TCLAP::ValueArg blockTransfoArg("t","in-transform","Transformation computed between blocks (0: direction, 1: direction+scale, 2: direction+scale+skew, default: 2)",false,2,"transformation between blocks",cmd); TCLAP::ValueArg agregatorArg("","agregator","Transformation agregator type (0: Baloo, 1: M-smoother, default: 0)",false,0,"agregator type",cmd); - TCLAP::ValueArg blockMetricArg("","metric","Similarity metric between blocks (0: correlation coefficient, 1: squared correlation coefficient, 2: mean squares, default: 1)",false,1,"similarity metric",cmd); + TCLAP::ValueArg blockMetricArg("","metric","Similarity metric between blocks (0: mean squares, 1: correlation coefficient, 2: squared correlation coefficient, default: 2)",false,2,"similarity metric",cmd); TCLAP::SwitchArg weightedAgregationArg("w","no-weighted-agregation", "If set, weighted agregation is deactivated", cmd, false); TCLAP::ValueArg extrapolationSigmaArg("","fs","Sigma for extrapolation of local pairings (default: 3)",false,3,"extrapolation sigma",cmd); diff --git a/Anima/registration/anatomical-commands/bm_distortion_correction/animaPyramidalDistortionCorrectionBlockMatchingBridge.h b/Anima/registration/anatomical-commands/bm_distortion_correction/animaPyramidalDistortionCorrectionBlockMatchingBridge.h index 3e602db1b..27ad0d096 100644 --- a/Anima/registration/anatomical-commands/bm_distortion_correction/animaPyramidalDistortionCorrectionBlockMatchingBridge.h +++ b/Anima/registration/anatomical-commands/bm_distortion_correction/animaPyramidalDistortionCorrectionBlockMatchingBridge.h @@ -9,9 +9,9 @@ enum Metric { - Correlation = 0, - SquaredCorrelation, - MeanSquares + MeanSquares = 0, + Correlation, + SquaredCorrelation }; enum TransformKind diff --git a/Anima/registration/anatomical-commands/dense_svf_bm_registration/animaDenseSVFBMRegistration.cxx b/Anima/registration/anatomical-commands/dense_svf_bm_registration/animaDenseSVFBMRegistration.cxx index 26f9b179e..974c61c63 100644 --- a/Anima/registration/anatomical-commands/dense_svf_bm_registration/animaDenseSVFBMRegistration.cxx +++ b/Anima/registration/anatomical-commands/dense_svf_bm_registration/animaDenseSVFBMRegistration.cxx @@ -27,7 +27,7 @@ int main(int argc, const char** argv) TCLAP::ValueArg blockTransfoArg("t","in-transform","Transformation computed between blocks (0: translation, 1: rigid, 2: affine, 3: directional affine, default: 0)",false,0,"transformation between blocks",cmd); TCLAP::ValueArg directionArg("d","dir","Affine direction for directional transform output (default: 1 = Y axis)",false,1,"direction of directional affine",cmd); - TCLAP::ValueArg blockMetricArg("","metric","Similarity metric between blocks (0: squared correlation coefficient, 1: correlation coefficient, 2: mean squares, default: 0)",false,0,"similarity metric",cmd); + TCLAP::ValueArg blockMetricArg("","metric","Similarity metric between blocks (0: mean squares, 1: correlation coefficient, 2: squared correlation coefficient, default: 2)",false,2,"similarity metric",cmd); TCLAP::ValueArg optimizerArg("","opt","Optimizer for optimal block search (0: Exhaustive, 1: Bobyqa, default: 1)",false,1,"optimizer",cmd); TCLAP::ValueArg maxIterationsArg("","mi","Maximum block match iterations (default: 10)",false,10,"maximum iterations",cmd); diff --git a/Anima/registration/anatomical-commands/dense_svf_bm_registration/animaPyramidalDenseSVFMatchingBridge.h b/Anima/registration/anatomical-commands/dense_svf_bm_registration/animaPyramidalDenseSVFMatchingBridge.h index 60a8876c4..73a385c32 100644 --- a/Anima/registration/anatomical-commands/dense_svf_bm_registration/animaPyramidalDenseSVFMatchingBridge.h +++ b/Anima/registration/anatomical-commands/dense_svf_bm_registration/animaPyramidalDenseSVFMatchingBridge.h @@ -73,9 +73,9 @@ class PyramidalDenseSVFMatchingBridge : public itk::ProcessObject enum Metric { - SquaredCorrelation = 0, + MeanSquares = 0, Correlation, - MeanSquares + SquaredCorrelation }; enum Optimizer diff --git a/Anima/registration/anatomical-commands/eddy_current_correction/animaEddyCurrentCorrection.cxx b/Anima/registration/anatomical-commands/eddy_current_correction/animaEddyCurrentCorrection.cxx index 6bf9ca8e2..47629b0d7 100644 --- a/Anima/registration/anatomical-commands/eddy_current_correction/animaEddyCurrentCorrection.cxx +++ b/Anima/registration/anatomical-commands/eddy_current_correction/animaEddyCurrentCorrection.cxx @@ -45,7 +45,7 @@ int main(int argc, const char** argv) TCLAP::ValueArg stdevThresholdArg("s","stdev","Threshold block standard deviation (default: 5)",false,5,"block minimal standard deviation",cmd); TCLAP::ValueArg percentageKeptArg("k","per-kept","Percentage of blocks with the highest variance kept (default: 0.8)",false,0.8,"percentage of blocks kept",cmd); - TCLAP::ValueArg blockMetricArg("","metric","Similarity metric between blocks (0: squared correlation coefficient, 1: correlation coefficient, 2: mean squares, default: 0)",false,0,"similarity metric",cmd); + TCLAP::ValueArg blockMetricArg("","metric","Similarity metric between blocks (0: mean squares, 1: correlation coefficient, 2: squared correlation coefficient, default: 2)",false,2,"similarity metric",cmd); TCLAP::ValueArg optimizerArg("","opt","Optimizer for optimal block search (0: Exhaustive, 1: Bobyqa, default: 1)",false,1,"optimizer",cmd); TCLAP::ValueArg maxIterationsArg("","mi","Maximum block match iterations (default: 10)",false,10,"maximum iterations",cmd); diff --git a/Anima/registration/anatomical-commands/pyramidal_bm_registration/animaPyramidalBMRegistration.cxx b/Anima/registration/anatomical-commands/pyramidal_bm_registration/animaPyramidalBMRegistration.cxx index a95af1f2b..d16cee15a 100644 --- a/Anima/registration/anatomical-commands/pyramidal_bm_registration/animaPyramidalBMRegistration.cxx +++ b/Anima/registration/anatomical-commands/pyramidal_bm_registration/animaPyramidalBMRegistration.cxx @@ -42,7 +42,7 @@ int main(int argc, const char** argv) TCLAP::ValueArg blockTransfoArg("t","in-transform","Transformation computed between blocks (0: translation, 1: rigid, 2: affine, 3: directional affine, default: 0)",false,0,"transformation between blocks",cmd); TCLAP::ValueArg directionArg("d","dir","Affine direction for directional transform output (default: 1 = Y axis)",false,1,"direction of directional affine",cmd); - TCLAP::ValueArg blockMetricArg("","metric","Similarity metric between blocks (0: squared correlation coefficient, 1: correlation coefficient, 2: mean squares, default: 0)",false,0,"similarity metric",cmd); + TCLAP::ValueArg blockMetricArg("","metric","Similarity metric between blocks (0: mean squares, 1: correlation coefficient, 2: squared correlation coefficient, default: 2)",false,2,"similarity metric",cmd); TCLAP::ValueArg optimizerArg("","opt","Optimizer for optimal block search (0: Exhaustive, 1: Bobyqa, default: 1)",false,1,"optimizer",cmd); TCLAP::ValueArg maxIterationsArg("","mi","Maximum block match iterations (default: 10)",false,10,"maximum iterations",cmd); diff --git a/Anima/registration/anatomical-commands/pyramidal_bm_registration/animaPyramidalBlockMatchingBridge.h b/Anima/registration/anatomical-commands/pyramidal_bm_registration/animaPyramidalBlockMatchingBridge.h index 9b8ec6a42..0fb3210e5 100644 --- a/Anima/registration/anatomical-commands/pyramidal_bm_registration/animaPyramidalBlockMatchingBridge.h +++ b/Anima/registration/anatomical-commands/pyramidal_bm_registration/animaPyramidalBlockMatchingBridge.h @@ -74,9 +74,9 @@ class PyramidalBlockMatchingBridge : public itk::ProcessObject enum Metric { - SquaredCorrelation = 0, + MeanSquares = 0, Correlation, - MeanSquares + SquaredCorrelation }; enum Optimizer