Skip to content

Commit 83812bd

Browse files
Merge pull request #113 from robotology/release/0.7.0
🚀 Release 0.7.0
2 parents 255305d + 06fcea2 commit 83812bd

7 files changed

Lines changed: 12 additions & 12 deletions

File tree

docs/pages/mpc.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ if(!solver.initSolver()) return 1;
142142

143143
The optimization problem can be solved calling the following method
144144
\code{.cpp}
145-
if(!solver.solve()) return 1;
145+
if(solver.solveProblem() != OsqpEigen::ErrorExitFlag::NoError) return 1;
146146
\endcode
147147
and the solution can be easily got by calling the following method
148148
\code{.cpp}
@@ -161,4 +161,4 @@ Eigen::VectorXd QPSolution = solver.getSolution();
161161
\include MPCExample.cpp
162162

163163
The example presented generates the following results
164-
\image html mpc_result.png
164+
\image html mpc_result.png

example/src/MPCExample.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ int main()
276276
for (int i = 0; i < numberOfSteps; i++){
277277

278278
// solve the QP problem
279-
if(!solver.solve()) return 1;
279+
if(solver.solveProblem() != OsqpEigen::ErrorExitFlag::NoError) return 1;
280280

281281
// get the controller input
282282
QPSolution = solver.getSolution();

package.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0"?>
22
<package format="3">
33
<name>osqp-eigen</name>
4-
<version>0.6.4</version>
5-
<description>Simple Eigen-C++ wrapper for OSQP library </description>
4+
<version>0.7.0</version>
5+
<description>Simple Eigen-C++ wrapper for OSQP library</description>
66
<maintainer email="tbd@tbd.tbd">tbd</maintainer>
77

88
<license>BSD</license>

tests/MPCTest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ TEST_CASE("MPCTest")
297297
startTime = clock();
298298

299299
// solve the QP problem
300-
REQUIRE(solver.solve());
300+
REQUIRE(solver.solveProblem() == OsqpEigen::ErrorExitFlag::NoError);
301301

302302
// get the controller input
303303
QPSolution = solver.getSolution();

tests/MPCUpdateMatricesTest.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ TEST_CASE("MPCTest Update matrices")
273273
REQUIRE(solver.updateBounds(lowerBound, upperBound));
274274

275275
// solve the QP problem
276-
REQUIRE(solver.solve());
276+
REQUIRE(solver.solveProblem() == OsqpEigen::ErrorExitFlag::NoError);
277277

278278
// get the controller input
279279
QPSolution = solver.getSolution();

tests/QPTest.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ TEST_CASE("QPProblem - Unconstrained")
3434
REQUIRE(solver.data()->setGradient(gradient));
3535

3636
REQUIRE(solver.initSolver());
37-
REQUIRE(solver.solve());
37+
REQUIRE(solver.solveProblem() == OsqpEigen::ErrorExitFlag::NoError);
3838

3939
// expected solution
4040
Eigen::Vector2d expectedSolution;
@@ -85,7 +85,7 @@ TEST_CASE("QPProblem")
8585

8686
REQUIRE(solver.initSolver());
8787

88-
REQUIRE(solver.solve());
88+
REQUIRE(solver.solveProblem() == OsqpEigen::ErrorExitFlag::NoError);
8989
Eigen::Vector2d expectedSolution;
9090
expectedSolution << 0.3, 0.7;
9191

tests/UpdateMatricesTest.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ TEST_CASE("QPProblem - FirstRun")
5959
REQUIRE(solver.data()->setUpperBound(upperBound));
6060

6161
REQUIRE(solver.initSolver());
62-
REQUIRE(solver.solve());
62+
REQUIRE(solver.solveProblem() == OsqpEigen::ErrorExitFlag::NoError);
6363

6464
auto solution = solver.getSolution();
6565
std::cout << COUT_GTEST_MGT << "Solution [" << solution(0) << " "
@@ -80,7 +80,7 @@ TEST_CASE("QPProblem - SparsityConstant")
8080

8181
REQUIRE(solver.updateHessianMatrix(H_s));
8282
REQUIRE(solver.updateLinearConstraintsMatrix(A_s));
83-
REQUIRE(solver.solve());
83+
REQUIRE(solver.solveProblem() == OsqpEigen::ErrorExitFlag::NoError);
8484

8585
auto solution = solver.getSolution();
8686
std::cout << COUT_GTEST_MGT << "Solution [" << solution(0) << " "
@@ -101,7 +101,7 @@ TEST_CASE("QPProblem - SparsityChange")
101101

102102
REQUIRE(solver.updateHessianMatrix(H_s));
103103
REQUIRE(solver.updateLinearConstraintsMatrix(A_s));
104-
REQUIRE(solver.solve());
104+
REQUIRE(solver.solveProblem() == OsqpEigen::ErrorExitFlag::NoError);
105105

106106
auto solution = solver.getSolution();
107107
std::cout << COUT_GTEST_MGT << "Solution [" << solution(0) << " "

0 commit comments

Comments
 (0)