Merge branch 'ijackson'

diff --git a/yarrg/web/routetrade b/yarrg/web/routetrade
index 553afe05e96f63a36ab4d74e1709f7f22fe57dcd..d90bf40fb7afe7993c0f0924e4ea38c2e6dc2ba0 100644 (file)
--- a/yarrg/web/routetrade
+++ b/yarrg/web/routetrade
@@ -509,7 +509,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= '';