12345qiupeng
/
gtsam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[BUGFIX] Fixed Linker Errors in Release Mode

release/4.3a0
Ivan Jimenez 2016-02-21 23:36:39 -05:00
parent 482144821b
commit 0987ae259c
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gtsam_unstable/linear/InequalityFactorGraph.h
View File

@ -19,6 +19,7 @@
#pragma once #pragma once
#include <gtsam_unstable/linear/LinearInequality.h> #include <gtsam_unstable/linear/LinearInequality.h>
#include <gtsam/inference/FactorGraph-inst.h>
#include <gtsam/linear/VectorValues.h> #include <gtsam/linear/VectorValues.h>
#include <gtsam/inference/FactorGraph.h> #include <gtsam/inference/FactorGraph.h>
@ -38,8 +39,7 @@ public:
} }
/** equals */ /** equals */
bool equals(const InequalityFactorGraph& other, bool equals(const InequalityFactorGraph& other, double tol = 1e-9) const {
double tol = 1e-9) const {
return Base::equals(other, tol); return Base::equals(other, tol);
} }
@ -47,18 +47,18 @@ public:
* Compute error of a guess. * Compute error of a guess.
* Infinity error if it violates an inequality; zero otherwise. */ * Infinity error if it violates an inequality; zero otherwise. */
double error(const VectorValues& x) const { double error(const VectorValues& x) const {
BOOST_FOREACH(const sharedFactor& factor, *this){ BOOST_FOREACH(const sharedFactor& factor, *this) {
if(factor) if(factor)
if (factor->error(x) > 0) if (factor->error(x) > 0)
return std::numeric_limits<double>::infinity(); return std::numeric_limits<double>::infinity();
} }
return 0.0; return 0.0;
} }
}; };
/// traits /// traits
template<> struct traits<InequalityFactorGraph> : public Testable< template<>
InequalityFactorGraph> { struct traits<InequalityFactorGraph> : public Testable<InequalityFactorGraph> {
}; };
} // \ namespace gtsam } // \ namespace gtsam