diff --git a/gtsam/hybrid/tests/testHybridFactorGraph.cpp b/gtsam/hybrid/tests/testHybridFactorGraph.cpp index d76eaf08d..e4d207af3 100644 --- a/gtsam/hybrid/tests/testHybridFactorGraph.cpp +++ b/gtsam/hybrid/tests/testHybridFactorGraph.cpp @@ -55,7 +55,7 @@ TEST(HybridFactorGraph, Keys) { std::vector components{ std::make_shared(X(1), I_3x3, Z_3x1), std::make_shared(X(1), I_3x3, Vector3::Ones())}; - hfg.add(HybridGaussianFactor({X(1)}, {m1}, components)); + hfg.add(HybridGaussianFactor({X(1)}, m1, components)); KeySet expected_continuous{X(0), X(1)}; EXPECT( @@ -65,11 +65,9 @@ TEST(HybridFactorGraph, Keys) { EXPECT(assert_container_equality(expected_discrete, hfg.discreteKeySet())); } -/* ************************************************************************* - */ +/* ************************************************************************* */ int main() { TestResult tr; return TestRegistry::runAllTests(tr); } -/* ************************************************************************* - */ +/* ************************************************************************* */ diff --git a/gtsam/hybrid/tests/testHybridGaussianFactorGraph.cpp b/gtsam/hybrid/tests/testHybridGaussianFactorGraph.cpp index 36e2887c8..66a54f73f 100644 --- a/gtsam/hybrid/tests/testHybridGaussianFactorGraph.cpp +++ b/gtsam/hybrid/tests/testHybridGaussianFactorGraph.cpp @@ -232,9 +232,6 @@ TEST(HybridGaussianFactorGraph, eliminateFullMultifrontalTwoClique) { hfg.add(JacobianFactor(X(1), I_3x3, X(2), -I_3x3, Z_3x1)); { - std::vector factors = { - {std::make_shared(X(0), I_3x3, Z_3x1), 0.0}, - {std::make_shared(X(0), I_3x3, Vector3::Ones()), 0.0}}; hfg.add(HybridGaussianFactor({X(0)}, {M(0), 2}, two::components(X(0)))); hfg.add(HybridGaussianFactor({X(2)}, {M(1), 2}, two::components(X(2)))); } @@ -259,7 +256,7 @@ TEST(HybridGaussianFactorGraph, eliminateFullMultifrontalTwoClique) { EXPECT_LONGS_EQUAL(0, remaining->size()); /* - (Fan) Explanation: the Junction tree will need to reeliminate to get to the + (Fan) Explanation: the Junction tree will need to re-eliminate to get to the marginal on X(1), which is not possible because it involves eliminating discrete before continuous. The solution to this, however, is in Murphy02. TLDR is that this is 1. expensive and 2. inexact. nevertheless it is doable.