Two more tbb compile issues
parent
874f0deeee
commit
6a035b88d7
|
@ -57,7 +57,7 @@ inline HybridBayesNet createHybridBayesNet(int num_measurements = 1,
|
||||||
|
|
||||||
// Add prior on mode.
|
// Add prior on mode.
|
||||||
const size_t nrModes = manyModes ? num_measurements : 1;
|
const size_t nrModes = manyModes ? num_measurements : 1;
|
||||||
for (int i = 0; i < nrModes; i++) {
|
for (const size_t i = 0; i < nrModes; i++) {
|
||||||
bayesNet.emplace_back(new DiscreteConditional({M(i), 2}, "4/6"));
|
bayesNet.emplace_back(new DiscreteConditional({M(i), 2}, "4/6"));
|
||||||
}
|
}
|
||||||
return bayesNet;
|
return bayesNet;
|
||||||
|
|
|
@ -24,12 +24,11 @@ using namespace gtsam;
|
||||||
|
|
||||||
/* ************************************************************************* */
|
/* ************************************************************************* */
|
||||||
TEST(Errors, arithmetic) {
|
TEST(Errors, arithmetic) {
|
||||||
Errors e = std::list<Vector>{Vector2(1.0, 2.0), Vector3(3.0, 4.0, 5.0)};
|
Errors e = {Vector2(1.0, 2.0), Vector3(3.0, 4.0, 5.0)};
|
||||||
DOUBLES_EQUAL(1 + 4 + 9 + 16 + 25, dot(e, e), 1e-9);
|
DOUBLES_EQUAL(1 + 4 + 9 + 16 + 25, dot(e, e), 1e-9);
|
||||||
|
|
||||||
axpy(2.0, e, e);
|
axpy(2.0, e, e);
|
||||||
const Errors expected =
|
const Errors expected = {Vector2(3.0, 6.0), Vector3(9.0, 12.0, 15.0)};
|
||||||
std::list<Vector>{Vector2(3.0, 6.0), Vector3(9.0, 12.0, 15.0)};
|
|
||||||
CHECK(assert_equal(expected, e));
|
CHECK(assert_equal(expected, e));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue