projects
/
libfirm
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
valueset: Remove the unused link field.
[libfirm]
/
ir
/
lpp
/
lpp_gurobi.c
diff --git
a/ir/lpp/lpp_gurobi.c
b/ir/lpp/lpp_gurobi.c
index
6f896d9
..
6b043e4
100644
(file)
--- a/
ir/lpp/lpp_gurobi.c
+++ b/
ir/lpp/lpp_gurobi.c
@@
-71,15
+71,10
@@
static gurobi_t *new_gurobi(lpp_t *lpp)
* The only thing gurobi sanely supports is giving a string with a filename
* :-( ...so we use /tmp/firm_gurobi.log as a temporary measure...
*/
* The only thing gurobi sanely supports is giving a string with a filename
* :-( ...so we use /tmp/firm_gurobi.log as a temporary measure...
*/
-#if 0
- error = GRBsetlogfile(grb->env, lpp->log);
- check_gurobi_error(grb, error);
-#else
if (lpp->log != stdout && lpp->log != stderr) {
error = GRBsetintparam(grb->env, GRB_INT_PAR_OUTPUTFLAG, 0);
check_gurobi_error(grb, error);
}
if (lpp->log != stdout && lpp->log != stderr) {
error = GRBsetintparam(grb->env, GRB_INT_PAR_OUTPUTFLAG, 0);
check_gurobi_error(grb, error);
}
-#endif
return grb;
}
return grb;
}
@@
-142,14
+137,6
@@
static void gurobi_construct(gurobi_t *grb)
colname[i] = (char*) curr_var->name;
vartype[i] = gurobi_var_encoding[curr_var->type.var_type];
colname[i] = (char*) curr_var->name;
vartype[i] = gurobi_var_encoding[curr_var->type.var_type];
-#if 0
- if (curr_var->value_kind == lpp_value_start) {
- panic("start values not supported in gurobi yet");
- indices[sv_cnt] = i;
- startv[sv_cnt++] = curr_var->value;
- }
-#endif
-
matbeg[i] = o;
matcnt[i] = 0;
matrix_foreach_in_col(lpp->m, 1 + i, elem) {
matbeg[i] = o;
matcnt[i] = 0;
matrix_foreach_in_col(lpp->m, 1 + i, elem) {
@@
-197,16
+184,6
@@
static void gurobi_solve(gurobi_t *grb)
check_gurobi_error(grb, error);
}
check_gurobi_error(grb, error);
}
-#if 0
- /*
- * If a bound of the objective function is supplied,
- * set it accordingly, dependign on minimization or maximization.
- */
- if(lpp->set_bound) {
- fprintf(stderr, "Warning: gurobi bound not implemented yet\n");
- }
-#endif
-
/* solve */
error = GRBoptimize(grb->model);
check_gurobi_error(grb, error);
/* solve */
error = GRBoptimize(grb->model);
check_gurobi_error(grb, error);