From a00d37005bbcd2f6702be15d58ac8312a531b163 Mon Sep 17 00:00:00 2001 From: Varun Agrawal Date: Mon, 30 Nov 2020 18:21:36 -0500 Subject: [PATCH] Don't throw error for Kappa and test parameter print --- gtsam/sfm/ShonanAveraging.cpp | 1 + gtsam/sfm/tests/testShonanAveraging.cpp | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/gtsam/sfm/ShonanAveraging.cpp b/gtsam/sfm/ShonanAveraging.cpp index e08bc4dd6..bc3783a27 100644 --- a/gtsam/sfm/ShonanAveraging.cpp +++ b/gtsam/sfm/ShonanAveraging.cpp @@ -346,6 +346,7 @@ static double Kappa(const BinaryMeasurement &measurement) { std::cout << "Verification of optimality does not work with robust cost " "function" << std::endl; + sigma = 1; // setting arbitrary value } else { throw std::invalid_argument( "Shonan averaging noise models must be isotropic (but robust losses " diff --git a/gtsam/sfm/tests/testShonanAveraging.cpp b/gtsam/sfm/tests/testShonanAveraging.cpp index 9242b94a3..002109454 100644 --- a/gtsam/sfm/tests/testShonanAveraging.cpp +++ b/gtsam/sfm/tests/testShonanAveraging.cpp @@ -17,6 +17,7 @@ */ #include +#include #include #include #include @@ -329,7 +330,11 @@ TEST(ShonanAveraging2, noisyToyGraphWithHuber) { ShonanAveraging2::Parameters parameters(lmParams); auto measurements = parseMeasurements(g2oFile); parameters.setUseHuber(true); - parameters.print(); + string parameters_print = + " ShonanAveragingParameters: \n alpha: 0\n beta: 1\n gamma: 0\n " + "useHuber: 1\n"; + assert_print_equal(parameters_print, parameters); + ShonanAveraging2 shonan(measurements, parameters); EXPECT_LONGS_EQUAL(4, shonan.nrUnknowns());