From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 17 Sep 2009 00:12:37 +0000 (+0100)
Subject: Use more glpk's more advanced MIP solver and enable various options; limit cpu
X-Git-Tag: 5.0^2~133^2~1
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-live.git;a=commitdiff_plain;h=1d5eaaa6191b09cbf54822dfdba1cd497991b26b

Use more glpk's more advanced MIP solver and enable various options; limit cpu
---

diff --git a/yarrg/web/routetrade b/yarrg/web/routetrade
index 73740ea..1991017 100644
--- a/yarrg/web/routetrade
+++ b/yarrg/web/routetrade
@@ -488,7 +488,8 @@ if ($qa->{'debug'}) {
 	my $input= pipethrough_prep();
 	print $input $cplex or die $!;
 	my $output= pipethrough_run_along($input, undef, 'glpsol',
-		qw(glpsol --cpxlp /dev/stdin -o /dev/stdout));
+		qw(glpsol --tmlim 2 --memlim 5 --intopt --cuts --bfs
+		          --cpxlp /dev/stdin -o /dev/stdout));
 	print "<pre>\n" if $qa->{'debug'};
 	my $found_section= 0;
 	my $glpsol_out= '';