Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
CoMISo
CoMISo
Commits
9cd1dce9
Commit
9cd1dce9
authored
Dec 01, 2016
by
Max Lyon
Browse files
Merge branch 'Fix_warnings-GF' into warning_fixes
parents
3d8f6160
2ae4b715
Changes
2
Hide whitespace changes
Inline
Side-by-side
NSolver/AcceleratedQuadraticProxy.hh
View file @
9cd1dce9
...
...
@@ -63,9 +63,9 @@ public:
COMISO
::
StopWatch
sw
;
sw
.
start
();
// number of unknowns
auto
n
=
_quadratic_problem
->
n_unknowns
();
size_t
n
=
_quadratic_problem
->
n_unknowns
();
// number of constraints
auto
m
=
_b
.
size
();
size_t
m
=
_b
.
size
();
std
::
cerr
<<
"optmize via AQP with "
<<
n
<<
" unknowns and "
<<
m
<<
" linear constraints"
<<
std
::
endl
;
...
...
@@ -193,7 +193,7 @@ protected:
double
backtracking_line_search
(
NProblemInterface
*
_quadratic_problem
,
NProblemInterface
*
_nonlinear_problem
,
VectorD
&
_x
,
VectorD
&
_g
,
VectorD
&
_dx
,
double
&
_rel_df
,
double
_t_start
=
1.0
)
{
auto
n
=
_x
.
size
();
size_t
n
=
_x
.
size
();
// pre-compute objective
double
fx
=
_quadratic_problem
->
eval_f
(
_x
.
data
())
+
_nonlinear_problem
->
eval_f
(
_x
.
data
());
...
...
Solver/ConstrainedSolverT.cc
View file @
9cd1dce9
...
...
@@ -634,7 +634,7 @@ make_constraints_independent_reordering(
while
(
!
queue
.
empty
())
{
// get next row
auto
i
=
queue
.
get_next
();
unsigned
int
i
=
queue
.
get_next
();
row_ordering
.
push_back
(
i
);
row_visited
[
i
]
=
true
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment