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

make QPParser tests pass on MacOSX-10.10.5/clang-700.1.81(LLVM 7.0.2)/boost-1.59

release/4.3a0
Duy-Nguyen Ta 2016-06-18 00:40:23 -04:00
parent 49cc1e5f1f
commit aa443fdef0
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gtsam_unstable/linear/RawQP.cpp
View File

@ -225,31 +225,31 @@ QP RawQP::makeQP() {
madeQP.cost.push_back(obj); madeQP.cost.push_back(obj);
for (auto kv : E) { for (auto kv : E) {
std::vector < std::pair<Key, Matrix11> > KeyMatPair; std::map<Key, Matrix11> keyMatrixMap;
for (auto km : kv.second) { for (auto km : kv.second) {
KeyMatPair.push_back(km); keyMatrixMap.insert(km);
} }
madeQP.equalities.push_back( madeQP.equalities.push_back(
LinearEquality(KeyMatPair, b[kv.first] * I_1x1, dual_key_num++)); LinearEquality(keyMatrixMap, b[kv.first] * I_1x1, dual_key_num++));
} }
for (auto kv : IG) { for (auto kv : IG) {
std::vector < std::pair<Key, Matrix11> > KeyMatPair; std::map<Key, Matrix11> keyMatrixMap;
for (auto km : kv.second) { for (auto km : kv.second) {
km.second = -km.second; km.second = -km.second;
KeyMatPair.push_back(km); keyMatrixMap.insert(km);
} }
madeQP.inequalities.push_back( madeQP.inequalities.push_back(
LinearInequality(KeyMatPair, -b[kv.first], dual_key_num++)); LinearInequality(keyMatrixMap, -b[kv.first], dual_key_num++));
} }
for (auto kv : IL) { for (auto kv : IL) {
std::vector < std::pair<Key, Matrix11> > KeyMatPair; std::map<Key, Matrix11> keyMatrixMap;
for (auto km : kv.second) { for (auto km : kv.second) {
KeyMatPair.push_back(km); keyMatrixMap.insert(km);
} }
madeQP.inequalities.push_back( madeQP.inequalities.push_back(
LinearInequality(KeyMatPair, b[kv.first], dual_key_num++)); LinearInequality(keyMatrixMap, b[kv.first], dual_key_num++));
} }
for (Key k : keys) { for (Key k : keys) {

4
gtsam_unstable/linear/tests/testQPSolver.cpp
View File

@ -222,9 +222,9 @@ pair<QP, QP> testParser(QPSParser parser) {
// 2x + y >= 2 // 2x + y >= 2
// -x + 2y <= 6 // -x + 2y <= 6
expectedqp.inequalities.push_back( expectedqp.inequalities.push_back(
LinearInequality(X2, -I_1x1, X1, -2.0 * I_1x1, -2, 0)); LinearInequality(X1, -2.0 * I_1x1, X2, -I_1x1, -2, 0));
expectedqp.inequalities.push_back( expectedqp.inequalities.push_back(
LinearInequality(X2, 2.0 * I_1x1, X1, -I_1x1, 6, 1)); LinearInequality(X1, -I_1x1, X2, 2.0 * I_1x1, 6, 1));
// x<= 20 // x<= 20
expectedqp.inequalities.push_back(LinearInequality(X1, I_1x1, 20, 4)); expectedqp.inequalities.push_back(LinearInequality(X1, I_1x1, 20, 4));
//x >= 0 //x >= 0