summaryrefslogtreecommitdiffhomepage
path: root/ir/lpp
diff options
context:
space:
mode:
authorMatthias Braun <matze@braunis.de>2011-12-01 19:04:36 +0100
committerMatthias Braun <matze@braunis.de>2011-12-01 20:02:21 +0100
commit846df6812a98f4c43073e16bdb22a0fdbe09289e (patch)
tree591834ac6bf0054039d9aef05ab7c1ed0f671de7 /ir/lpp
parente665f86c4e76a5414e6555c8c98da324cc5335e3 (diff)
lpp_gurobi:disable log to console unless requested
Diffstat (limited to 'ir/lpp')
-rw-r--r--ir/lpp/lpp_gurobi.c16
1 files changed, 7 insertions, 9 deletions
diff --git a/ir/lpp/lpp_gurobi.c b/ir/lpp/lpp_gurobi.c
index fe0cb3a..a87e6e1 100644
--- a/ir/lpp/lpp_gurobi.c
+++ b/ir/lpp/lpp_gurobi.c
@@ -74,6 +74,11 @@ static gurobi_t *new_gurobi(lpp_t *lpp)
#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);
+ }
#endif
return grb;
@@ -193,22 +198,15 @@ static void gurobi_solve(gurobi_t *grb)
check_gurobi_error(grb, error);
}
- /*
- * If we have enough time, we instruct cplex to imply some
- * of its higher order magic to pursue the best solution
- */
- if(lpp->emphasis) {
- /* not implemented */
- }
-
+#if 0
/*
* If a bound of the objective function is supplied,
* set it accordingly, dependign on minimization or maximization.
*/
if(lpp->set_bound) {
- //panic("bound not implemented yet");
fprintf(stderr, "Warning: gurobi bound not implemented yet\n");
}
+#endif
/* solve */
error = GRBoptimize(grb->model);