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
9eb7213e
Commit
9eb7213e
authored
Dec 09, 2016
by
Max Lyon
Browse files
Merge branch 'Fix_warnings-GF' into warning_fixes
# Conflicts: # .gitlab-ci.yml # Base # CMakeLists.txt # cmake/FindCGAL.cmake
parents
54dc54db
bc3539da
Changes
5
Hide whitespace changes
Inline
Side-by-side
EigenSolver/EigenArpackMatrixT.hh
View file @
9eb7213e
...
...
@@ -66,7 +66,7 @@ public:
sllt_
.
compute
(
mat_
);
#if EIGEN_VERSION_AT_LEAST(3,1,0)
if
(
!
sllt_
.
info
()
!=
Eigen
::
Success
)
if
(
sllt_
.
info
()
!=
Eigen
::
Success
)
#else
if
(
!
sllt_
.
succeeded
()
)
#endif
...
...
NSolver/AcceleratedQuadraticProxy.hh
View file @
9eb7213e
...
...
@@ -33,7 +33,7 @@ namespace COMISO {
A more elaborate description follows.
*/
class
COMISODLLEXPORT
AcceleratedQuadraticProxy
class
AcceleratedQuadraticProxy
{
public:
...
...
NSolver/CBCSolver.cc
View file @
9eb7213e
...
...
@@ -17,7 +17,9 @@
#include
<CoMISo/Utils/CoMISoError.hh>
#include
<Base/Debug/DebTime.hh>
#include
<Base/Code/Quality.hh>
LOW_CODE_QUALITY_SECTION_BEGIN
// For Branch and bound
#include
"OsiSolverInterface.hpp"
#include
"CbcModel.hpp"
...
...
@@ -44,6 +46,7 @@
// Heuristics
#include
"CbcHeuristic.hpp"
#include
"CbcCompareDepth.hpp"
LOW_CODE_QUALITY_SECTION_END
#include
<stdexcept>
...
...
NSolver/ConeConstraint.cc
View file @
9eb7213e
...
...
@@ -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 @
9eb7213e
...
...
@@ -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
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