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
5eaf3185
Commit
5eaf3185
authored
Dec 19, 2016
by
Max Lyon
Browse files
Merge branch 'master' into warning_fixes
# Conflicts: # Solver/ConstrainedSolverT.cc
parents
3aab9816
05a5b0be
Changes
2
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
5eaf3185
...
...
@@ -11,7 +11,7 @@ my_add_subdir(Utils)
include_directories
(
${
PROJECT_SOURCE_DIR
}
/..
)
inc_3p_dir
(
Eigen
)
inc_3p_dir
(
Gmm
)
inc_3p_dir
(
IPOPT
)
inc_3p_
nuget_
dir
(
IPOPT
)
inc_3p_dir
(
Boost
)
# message(STATUS "${SOURCES}" "${HEADES}")
...
...
Solver/ConstrainedSolverT.cc
View file @
5eaf3185
...
...
@@ -470,11 +470,15 @@ make_constraints_independent(
{
double
cur_row_val
(
fabs
(
*
row_it
));
// gcd
// if the coefficient of an integer variable is not an integer, then
// the variable most problably will not be (expect if all coeffs are the same, e.g. 0.5)
if
((
double
(
int
(
cur_row_val
))
-
cur_row_val
)
!=
0.0
)
// If the coefficient of an integer variable is not an integer, then
// the variable most probably will not be. This is expected if all
// coeffs are the same, e.g. 0.5).
// This happens quite often in some ReForm test cases, so downgrading
// the warning below to DEB_line at high verbosity.
if
((
double
(
int
(
cur_row_val
))
-
cur_row_val
)
!=
0.0
)
{
//DEB_warning(2, "coefficient of integer variable is NOT integer : " << cur_row_val)
DEB_line
(
11
,
"coefficient of integer variable is NOT integer : "
<<
cur_row_val
);
gcd_update_valid
=
false
;
}
...
...
@@ -684,11 +688,15 @@ make_constraints_independent_reordering(
{
double
cur_row_val
(
fabs
(
*
row_it
));
// gcd
// if the coefficient of an integer variable is not an integer, then
// the variable most problably will not be (expect if all coeffs are the same, e.g. 0.5)
if
((
double
(
int
(
cur_row_val
))
-
cur_row_val
)
!=
0.0
)
// If the coefficient of an integer variable is not an integer, then
// the variable most probably will not be. This is expected if all
// coeffs are the same, e.g. 0.5).
// This happens quite often in some ReForm test cases, so downgrading
// the warning below to DEB_line at high verbosity.
if
((
double
(
int
(
cur_row_val
))
-
cur_row_val
)
!=
0.0
)
{
//DEB_warning(2, "coefficient of integer variable is NOT integer : " << cur_row_val);
DEB_line
(
11
,
"coefficient of integer variable is NOT integer : "
<<
cur_row_val
);
gcd_update_valid
=
false
;
}
...
...
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