From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 17 Sep 2009 00:13:00 +0000 (+0100)
Subject: Merge branch 'master' of ../ypp-sc-tools
X-Git-Tag: 5.0^2~134^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=97d26c012a638833535a5e1c98d287101b220887;hp=0759b42dbad7715339b0dceb5e910ea7698fa90a

Merge branch 'master' of ../ypp-sc-tools
---

diff --git a/yarrg/web/routetrade b/yarrg/web/routetrade
index c0fe986..383d554 100644
--- a/yarrg/web/routetrade
+++ b/yarrg/web/routetrade
@@ -506,7 +506,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= '';