Commit f4dde179 authored by Max Lyon's avatar Max Lyon

fix more warnings

parent 04aacfed
......@@ -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();
}
......
......@@ -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 ])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment