Skip to content

Commit 45ead1c

Browse files
NorahXiongmitsudome-ryoutalk
authored
fix(autoware_qp_interface): incorrect parameter passing in delegating constructor (#147)
Signed-off-by: NorahXiong <norah.xiong@autocore.ai> Co-authored-by: Ryohsuke Mitsudome <43976834+mitsudome-r@users.noreply.github.com> Co-authored-by: Yutaka Kondo <yutaka.kondo@youtalk.jp>
1 parent f27c9fb commit 45ead1c

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

common/autoware_qp_interface/include/autoware/qp_interface/osqp_interface.hpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,14 @@
2727
namespace autoware::qp_interface
2828
{
2929
constexpr c_float OSQP_INF = 1e30;
30+
constexpr int OSQP_MAX_ITERATION = 20000;
3031

3132
class OSQPInterface : public QPInterface
3233
{
3334
public:
3435
/// \brief Constructor without problem formulation
3536
OSQPInterface(
36-
const bool enable_warm_start = false, const int max_iteration = 20000,
37+
const bool enable_warm_start = false, const int max_iteration = OSQP_MAX_ITERATION,
3738
const c_float eps_abs = std::numeric_limits<c_float>::epsilon(),
3839
const c_float eps_rel = std::numeric_limits<c_float>::epsilon(), const bool polish = true,
3940
const bool verbose = false);

common/autoware_qp_interface/src/osqp_interface.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ OSQPInterface::OSQPInterface(
5252
const Eigen::MatrixXd & P, const Eigen::MatrixXd & A, const std::vector<double> & q,
5353
const std::vector<double> & l, const std::vector<double> & u, const bool enable_warm_start,
5454
const c_float eps_abs)
55-
: OSQPInterface(enable_warm_start, eps_abs)
55+
: OSQPInterface(enable_warm_start, OSQP_MAX_ITERATION, eps_abs)
5656
{
5757
initializeProblem(P, A, q, l, u);
5858
}
@@ -61,7 +61,7 @@ OSQPInterface::OSQPInterface(
6161
const CSC_Matrix & P, const CSC_Matrix & A, const std::vector<double> & q,
6262
const std::vector<double> & l, const std::vector<double> & u, const bool enable_warm_start,
6363
const c_float eps_abs)
64-
: OSQPInterface(enable_warm_start, eps_abs)
64+
: OSQPInterface(enable_warm_start, OSQP_MAX_ITERATION, eps_abs)
6565
{
6666
initializeCSCProblemImpl(P, A, q, l, u);
6767
}

0 commit comments

Comments
 (0)