Merge branch 'hybrid/optimize' into hybrid/optimize-2
commit
f165559f91
|
|
@ -104,6 +104,13 @@ VectorValues HybridBayesTree::optimize(const DiscreteValues& assignment) const {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// If TBB is enabled, the bayes net order gets reversed,
|
||||||
|
// so we pre-reverse it
|
||||||
|
#ifdef GTSAM_USE_TBB
|
||||||
|
auto reversed = boost::adaptors::reverse(gbn);
|
||||||
|
gbn = GaussianBayesNet(reversed.begin(), reversed.end());
|
||||||
|
#endif
|
||||||
|
|
||||||
// Return the optimized bayes net.
|
// Return the optimized bayes net.
|
||||||
return gbn.optimize();
|
return gbn.optimize();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue