Skip to content

Commit 84e3cee

Browse files
committed
proxqp: fix dimension check
1 parent c35a6d3 commit 84e3cee

File tree

3 files changed

+16
-16
lines changed

3 files changed

+16
-16
lines changed

include/proxsuite/proxqp/dense/helpers.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -183,25 +183,25 @@ update(optional<MatRef<T>> H,
183183
{
184184
// check the model is valid
185185
if (g != nullopt) {
186-
PROXSUITE_CHECK_ARGUMENT_SIZE(g.value().rows(),
186+
PROXSUITE_CHECK_ARGUMENT_SIZE(g.value().size(),
187187
model.dim,
188188
"the dimension wrt the primal variable x "
189189
"variable for updating g is not valid.");
190190
}
191191
if (b != nullopt) {
192-
PROXSUITE_CHECK_ARGUMENT_SIZE(b.value().rows(),
192+
PROXSUITE_CHECK_ARGUMENT_SIZE(b.value().size(),
193193
model.n_eq,
194194
"the dimension wrt equality constrained "
195195
"variables for updating b is not valid.");
196196
}
197197
if (u != nullopt) {
198-
PROXSUITE_CHECK_ARGUMENT_SIZE(u.value().rows(),
198+
PROXSUITE_CHECK_ARGUMENT_SIZE(u.value().size(),
199199
model.n_in,
200200
"the dimension wrt inequality constrained "
201201
"variables for updating u is not valid.");
202202
}
203203
if (l != nullopt) {
204-
PROXSUITE_CHECK_ARGUMENT_SIZE(l.value().rows(),
204+
PROXSUITE_CHECK_ARGUMENT_SIZE(l.value().size(),
205205
model.n_in,
206206
"the dimension wrt inequality constrained "
207207
"variables for updating l is not valid.");

include/proxsuite/proxqp/dense/wrapper.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ struct QP
136136
// check the model is valid
137137
if (g != nullopt && g.value().size() != 0) {
138138
PROXSUITE_CHECK_ARGUMENT_SIZE(
139-
g.value().rows(),
139+
g.value().size(),
140140
model.dim,
141141
"the dimension wrt the primal variable x variable for initializing g "
142142
"is not valid.");
@@ -145,7 +145,7 @@ struct QP
145145
}
146146
if (b != nullopt && b.value().size() != 0) {
147147
PROXSUITE_CHECK_ARGUMENT_SIZE(
148-
b.value().rows(),
148+
b.value().size(),
149149
model.n_eq,
150150
"the dimension wrt equality constrained variables for initializing b "
151151
"is not valid.");
@@ -154,7 +154,7 @@ struct QP
154154
}
155155
if (u != nullopt && u.value().size() != 0) {
156156
PROXSUITE_CHECK_ARGUMENT_SIZE(
157-
u.value().rows(),
157+
u.value().size(),
158158
model.n_in,
159159
"the dimension wrt inequality constrained variables for initializing u "
160160
"is not valid.");
@@ -163,7 +163,7 @@ struct QP
163163
}
164164
if (l != nullopt && l.value().size() != 0) {
165165
PROXSUITE_CHECK_ARGUMENT_SIZE(
166-
l.value().rows(),
166+
l.value().size(),
167167
model.n_in,
168168
"the dimension wrt inequality constrained variables for initializing l "
169169
"is not valid.");

include/proxsuite/proxqp/sparse/wrapper.hpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ struct QP
179179
}
180180
if (g != nullopt && g.value().size() != 0) {
181181
PROXSUITE_CHECK_ARGUMENT_SIZE(
182-
g.value().rows(),
182+
g.value().size(),
183183
model.dim,
184184
"the dimension wrt the primal variable x variable for initializing g "
185185
"is not valid.");
@@ -188,7 +188,7 @@ struct QP
188188
}
189189
if (b != nullopt && b.value().size() != 0) {
190190
PROXSUITE_CHECK_ARGUMENT_SIZE(
191-
b.value().rows(),
191+
b.value().size(),
192192
model.n_eq,
193193
"the dimension wrt equality constrained variables for initializing b "
194194
"is not valid.");
@@ -197,7 +197,7 @@ struct QP
197197
}
198198
if (u != nullopt && u.value().size() != 0) {
199199
PROXSUITE_CHECK_ARGUMENT_SIZE(
200-
u.value().rows(),
200+
u.value().size(),
201201
model.n_in,
202202
"the dimension wrt inequality constrained variables for initializing u "
203203
"is not valid.");
@@ -206,7 +206,7 @@ struct QP
206206
}
207207
if (l != nullopt && l.value().size() != 0) {
208208
PROXSUITE_CHECK_ARGUMENT_SIZE(
209-
l.value().rows(),
209+
l.value().size(),
210210
model.n_in,
211211
"the dimension wrt inequality constrained variables for initializing l "
212212
"is not valid.");
@@ -384,25 +384,25 @@ struct QP
384384

385385
// check the model is valid
386386
if (g != nullopt) {
387-
PROXSUITE_CHECK_ARGUMENT_SIZE(g.value().rows(),
387+
PROXSUITE_CHECK_ARGUMENT_SIZE(g.value().size(),
388388
model.dim,
389389
"the dimension wrt the primal variable x "
390390
"variable for updating g is not valid.");
391391
}
392392
if (b != nullopt) {
393-
PROXSUITE_CHECK_ARGUMENT_SIZE(b.value().rows(),
393+
PROXSUITE_CHECK_ARGUMENT_SIZE(b.value().size(),
394394
model.n_eq,
395395
"the dimension wrt equality constrained "
396396
"variables for updating b is not valid.");
397397
}
398398
if (u != nullopt) {
399-
PROXSUITE_CHECK_ARGUMENT_SIZE(u.value().rows(),
399+
PROXSUITE_CHECK_ARGUMENT_SIZE(u.value().size(),
400400
model.n_in,
401401
"the dimension wrt inequality constrained "
402402
"variables for updating u is not valid.");
403403
}
404404
if (l != nullopt) {
405-
PROXSUITE_CHECK_ARGUMENT_SIZE(l.value().rows(),
405+
PROXSUITE_CHECK_ARGUMENT_SIZE(l.value().size(),
406406
model.n_in,
407407
"the dimension wrt inequality constrained "
408408
"variables for updating l is not valid.");

0 commit comments

Comments
 (0)