Skip to content
GitLab
Menu
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
4b27fd87
Commit
4b27fd87
authored
Jan 04, 2016
by
Jan Möbius
Browse files
Merge branch 'fixcomiso' into 'master'
fixed debug output and const function type See merge request
!7
parents
66142cfb
226b8f6a
Pipeline
#675
passed with stage
Changes
3
Pipelines
1
Show whitespace changes
Inline
Side-by-side
NSolver/LeastSquaresProblem.cc
View file @
4b27fd87
...
@@ -199,7 +199,7 @@ store_result ( const double* _x )
...
@@ -199,7 +199,7 @@ store_result ( const double* _x )
bool
bool
LeastSquaresProblem
::
LeastSquaresProblem
::
constant_hessian
()
constant_hessian
()
const
{
{
for
(
unsigned
int
i
=
0
;
i
<
terms_
.
size
();
++
i
)
for
(
unsigned
int
i
=
0
;
i
<
terms_
.
size
();
++
i
)
{
{
...
...
NSolver/LeastSquaresProblem.hh
View file @
4b27fd87
...
@@ -65,7 +65,7 @@ public:
...
@@ -65,7 +65,7 @@ public:
virtual
void
store_result
(
const
double
*
_x
);
virtual
void
store_result
(
const
double
*
_x
);
// advanced properties
// advanced properties
virtual
bool
constant_hessian
();
virtual
bool
constant_hessian
()
const
;
// advanced usage
// advanced usage
void
add_to_gradient
(
const
double
*
_x
,
double
*
_g
,
const
double
_c
);
void
add_to_gradient
(
const
double
*
_x
,
double
*
_g
,
const
double
_c
);
...
...
Solver/MISolver.cc
View file @
4b27fd87
...
@@ -203,7 +203,7 @@ MISolver::solve_cplex(
...
@@ -203,7 +203,7 @@ MISolver::solve_cplex(
}
}
catch
(
IloException
&
e
)
catch
(
IloException
&
e
)
{
{
DEB_warning
(
2
,
"CPLEX Concert exception caught: "
<<
e
)
DEB_warning
(
2
,
"CPLEX Concert exception caught: "
<<
e
.
getMessage
()
)
}
}
catch
(...)
catch
(...)
{
{
...
...
Write
Preview
Supports
Markdown
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