From 48d21e0f4e00565ff6b4f3767079881e40f658ca Mon Sep 17 00:00:00 2001 From: Stephen Thompson Date: Tue, 26 Sep 2023 10:43:11 +0100 Subject: [PATCH 1/2] Issue #58 specified pivot_calibration_aos to try and make recursion clearer when using ransac --- sksurgerycalibration/algorithms/pivot.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sksurgerycalibration/algorithms/pivot.py b/sksurgerycalibration/algorithms/pivot.py index 89ab1fb..af9276a 100644 --- a/sksurgerycalibration/algorithms/pivot.py +++ b/sksurgerycalibration/algorithms/pivot.py @@ -154,7 +154,7 @@ def pivot_calibration_with_ransac(tracking_matrices, sample = tracking_matrices[indexes] try: - pointer_offset, pivot_location, _ = pivot_calibration(sample) + pointer_offset, pivot_location, _ = pivot_calibration_aos(sample) except ValueError: print("RANSAC, iteration " + str(iter_counter) + ", failed.") continue From e25da42961817205c00059e63fec4aab83a0bf5f Mon Sep 17 00:00:00 2001 From: Stephen Thompson Date: Tue, 26 Sep 2023 11:20:03 +0100 Subject: [PATCH 2/2] Issue #58 specify aos at all positions --- sksurgerycalibration/algorithms/pivot.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sksurgerycalibration/algorithms/pivot.py b/sksurgerycalibration/algorithms/pivot.py index af9276a..73ed5ce 100644 --- a/sksurgerycalibration/algorithms/pivot.py +++ b/sksurgerycalibration/algorithms/pivot.py @@ -180,7 +180,7 @@ def pivot_calibration_with_ransac(tracking_matrices, highest_number_of_inliers = number_of_inliers inlier_matrices = tracking_matrices[inlier_indices] best_pointer_offset, best_pivot_location, best_residual_error = \ - pivot_calibration(inlier_matrices) + pivot_calibration_aos(inlier_matrices) # Early exit condition, as soon as we find model with enough fit. if percentage_inliers > concensus_threshold and early_exit: