From 3abff90fb4111af03448f93941a6822a5228acc2 Mon Sep 17 00:00:00 2001 From: Varun Agrawal Date: Sat, 4 Jan 2025 05:27:49 -0500 Subject: [PATCH] fix tests --- gtsam/hybrid/tests/testGaussianMixture.cpp | 7 +++---- gtsam/hybrid/tests/testHybridEstimation.cpp | 2 +- gtsam/hybrid/tests/testHybridGaussianFactorGraph.cpp | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/gtsam/hybrid/tests/testGaussianMixture.cpp b/gtsam/hybrid/tests/testGaussianMixture.cpp index d273dd64f..c98485fea 100644 --- a/gtsam/hybrid/tests/testGaussianMixture.cpp +++ b/gtsam/hybrid/tests/testGaussianMixture.cpp @@ -81,7 +81,7 @@ TEST(GaussianMixture, GaussianMixtureModel) { auto eliminationResult = gmm.toFactorGraph({{Z(0), Vector1(midway)}}).eliminateSequential(); auto pMid = eliminationResult->at(0)->asDiscrete(); - EXPECT(assert_equal(TableDistribution(m, "60/40"), *pMid)); + EXPECT(assert_equal(TableDistribution(m, "60 40"), *pMid)); // Everywhere else, the result should be a sigmoid. for (const double shift : {-4, -2, 0, 2, 4}) { @@ -141,9 +141,8 @@ TEST(GaussianMixture, GaussianMixtureModel2) { EXPECT(assert_equal(expectedDiscretePosterior, eliminationResultMax->discretePosterior(vv))); - auto pMax = - *eliminationResultMax->at(0)->asDiscrete(); - EXPECT(assert_equal(TableDistribution(m, "42/58"), pMax, 1e-4)); + auto pMax = *eliminationResultMax->at(0)->asDiscrete(); + EXPECT(assert_equal(TableDistribution(m, "42 58"), pMax, 1e-4)); // Everywhere else, the result should be a bell curve like function. for (const double shift : {-4, -2, 0, 2, 4}) { diff --git a/gtsam/hybrid/tests/testHybridEstimation.cpp b/gtsam/hybrid/tests/testHybridEstimation.cpp index 1b7f8054f..425b29742 100644 --- a/gtsam/hybrid/tests/testHybridEstimation.cpp +++ b/gtsam/hybrid/tests/testHybridEstimation.cpp @@ -464,7 +464,7 @@ TEST(HybridEstimation, EliminateSequentialRegression) { // Create expected discrete conditional on m0. DiscreteKey m(M(0), 2); - TableDistribution expected(m % "0.51341712/1"); // regression + TableDistribution expected(m, "0.51341712 1"); // regression // Eliminate into BN using one ordering const Ordering ordering1{X(0), X(1), M(0)}; diff --git a/gtsam/hybrid/tests/testHybridGaussianFactorGraph.cpp b/gtsam/hybrid/tests/testHybridGaussianFactorGraph.cpp index a8d37c8f0..d54f8a141 100644 --- a/gtsam/hybrid/tests/testHybridGaussianFactorGraph.cpp +++ b/gtsam/hybrid/tests/testHybridGaussianFactorGraph.cpp @@ -650,7 +650,7 @@ TEST(HybridGaussianFactorGraph, EliminateTiny1) { mode, std::vector{conditional0, conditional1}); // Add prior on mode. - expectedBayesNet.emplace_shared(mode, "74/26"); + expectedBayesNet.emplace_shared(mode, "74 26"); // Test elimination const auto posterior = fg.eliminateSequential();