summaryrefslogtreecommitdiffhomepage
path: root/ir/lpp
diff options
context:
space:
mode:
authorMatthias Braun <matze@braunis.de>2012-12-04 02:02:50 +0100
committerMatthias Braun <matze@braunis.de>2012-12-04 18:15:02 +0100
commit793165ad171bd938143e0d466efafebde94b348a (patch)
tree02ac9f0b895e14194087cdc20f409dd9bc899c8e /ir/lpp
parent60642edefc02275041c9129aec281e177597cc25 (diff)
remove commented out code
Diffstat (limited to 'ir/lpp')
-rw-r--r--ir/lpp/lpp_gurobi.c23
-rw-r--r--ir/lpp/lpp_net.c5
2 files changed, 0 insertions, 28 deletions
diff --git a/ir/lpp/lpp_gurobi.c b/ir/lpp/lpp_gurobi.c
index 6f896d9..6b043e4 100644
--- 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...
*/
-#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;
}
@@ -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];
-#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) {
@@ -197,16 +184,6 @@ static void gurobi_solve(gurobi_t *grb)
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);
diff --git a/ir/lpp/lpp_net.c b/ir/lpp/lpp_net.c
index 6af2636..15ce82d 100644
--- a/ir/lpp/lpp_net.c
+++ b/ir/lpp/lpp_net.c
@@ -188,11 +188,6 @@ void lpp_solve_net(lpp_t *lpp, const char *host, const char *solver)
lpp_writes(comm, solver);
lpp_flush(comm);
-#if 0
- ERR_CHECK_RETURN_VOID(lpp_ack(fd, sizeof(buf), buf), == 0,
- ("could not set solver: %s", solver));
-#endif
-
t_send = ir_timer_new();
t_recv = ir_timer_new();