[with Alex and Richard] Fixed incorrect global switch to QR when any constraints are present: this is done in the GaussianFactorGraph::eliminatePreferXXX functions.
parent
24292d6c13
commit
c01e3d456a
|
|
@ -24,12 +24,12 @@ namespace gtsam {
|
||||||
|
|
||||||
/* ************************************************************************* */
|
/* ************************************************************************* */
|
||||||
GaussianMultifrontalSolver::GaussianMultifrontalSolver(const FactorGraph<GaussianFactor>& factorGraph, bool useQR) :
|
GaussianMultifrontalSolver::GaussianMultifrontalSolver(const FactorGraph<GaussianFactor>& factorGraph, bool useQR) :
|
||||||
Base(factorGraph), useQR_(useQR || hasConstraints(factorGraph)) {}
|
Base(factorGraph), useQR_(useQR) {}
|
||||||
|
|
||||||
/* ************************************************************************* */
|
/* ************************************************************************* */
|
||||||
GaussianMultifrontalSolver::GaussianMultifrontalSolver(const FactorGraph<GaussianFactor>::shared_ptr& factorGraph,
|
GaussianMultifrontalSolver::GaussianMultifrontalSolver(const FactorGraph<GaussianFactor>::shared_ptr& factorGraph,
|
||||||
const VariableIndex::shared_ptr& variableIndex, bool useQR) :
|
const VariableIndex::shared_ptr& variableIndex, bool useQR) :
|
||||||
Base(factorGraph, variableIndex), useQR_(useQR || hasConstraints(*factorGraph)) {}
|
Base(factorGraph, variableIndex), useQR_(useQR) {}
|
||||||
|
|
||||||
/* ************************************************************************* */
|
/* ************************************************************************* */
|
||||||
GaussianMultifrontalSolver::shared_ptr
|
GaussianMultifrontalSolver::shared_ptr
|
||||||
|
|
|
||||||
|
|
@ -26,14 +26,14 @@ namespace gtsam {
|
||||||
/* ************************************************************************* */
|
/* ************************************************************************* */
|
||||||
GaussianSequentialSolver::GaussianSequentialSolver(
|
GaussianSequentialSolver::GaussianSequentialSolver(
|
||||||
const FactorGraph<GaussianFactor>& factorGraph, bool useQR) :
|
const FactorGraph<GaussianFactor>& factorGraph, bool useQR) :
|
||||||
Base(factorGraph), useQR_(useQR || hasConstraints(factorGraph)) {
|
Base(factorGraph), useQR_(useQR) {
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ************************************************************************* */
|
/* ************************************************************************* */
|
||||||
GaussianSequentialSolver::GaussianSequentialSolver(
|
GaussianSequentialSolver::GaussianSequentialSolver(
|
||||||
const FactorGraph<GaussianFactor>::shared_ptr& factorGraph,
|
const FactorGraph<GaussianFactor>::shared_ptr& factorGraph,
|
||||||
const VariableIndex::shared_ptr& variableIndex, bool useQR) :
|
const VariableIndex::shared_ptr& variableIndex, bool useQR) :
|
||||||
Base(factorGraph, variableIndex), useQR_(useQR || hasConstraints(*factorGraph)) {
|
Base(factorGraph, variableIndex), useQR_(useQR) {
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ************************************************************************* */
|
/* ************************************************************************* */
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue