Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
CoMISo
CoMISo
Commits
f4dde179
Commit
f4dde179
authored
Dec 02, 2016
by
Max Lyon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix more warnings
parent
04aacfed
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
NSolver/ConeConstraint.cc
NSolver/ConeConstraint.cc
+1
-1
Solver/ConstrainedSolverT.cc
Solver/ConstrainedSolverT.cc
+2
-2
No files found.
NSolver/ConeConstraint.cc
View file @
f4dde179
...
...
@@ -27,7 +27,7 @@ namespace COMISO {
/// Default constructor
ConeConstraint
::
ConeConstraint
()
:
NConstraintInterface
(
NConstraintInterface
::
NC_GREATER_EQUAL
),
i
_
(
1
),
c
_
(
1
.0
)
c
_
(
1
.0
),
i
_
(
1
)
{
Q_
.
clear
();
}
...
...
Solver/ConstrainedSolverT.cc
View file @
f4dde179
...
...
@@ -454,7 +454,7 @@ make_constraints_independent(
{
int
cur_j
=
static_cast
<
int
>
(
row_it
.
index
());
// do not use the constant part
if
(
cur_j
!=
n_vars
-
1
)
if
(
cur_j
!=
(
int
)
n_vars
-
1
)
{
// found real valued var? -> finished (UPDATE: no not any more, find biggest real value to avoid x/1e-13)
if
(
!
roundmap
[
cur_j
])
...
...
@@ -668,7 +668,7 @@ make_constraints_independent_reordering(
{
int
cur_j
=
static_cast
<
int
>
(
row_it
.
index
());
// do not use the constant part
if
(
cur_j
!=
n_vars
-
1
)
if
(
cur_j
!=
(
int
)
n_vars
-
1
)
{
// found real valued var? -> finished (UPDATE: no not any more, find biggest real value to avoid x/1e-13)
if
(
!
roundmap
[
cur_j
])
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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