From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 25 Oct 2009 12:07:38 +0000 (+0000)
Subject: routetrade: WIP fix unticked trades
X-Git-Tag: 5.0^2~1
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.main.git;a=commitdiff_plain;h=62e5bf60d55a8e6ff3d938e2719d910ee4367210

routetrade: WIP fix unticked trades
---

diff --git a/yarrg/web/routetrade b/yarrg/web/routetrade
index c7dd03e..5dc5e77 100644
--- a/yarrg/web/routetrade
+++ b/yarrg/web/routetrade
@@ -424,7 +424,7 @@ foreach my $flow (@flows) {
 	if ($flow->{Suppress}) {
 		foreach my $sf (@{ $flow->{Subflows} }) {
 			$cplex .= "
-   $sf->{Var} = 0";
+   $sf->{Var} = 0\n";
 		}
 		next;
 	}
@@ -554,7 +554,7 @@ if ($qa->{'debug'}) {
 			\s* \d+ \s+
 			(\w+) \s+ (?: [A-Z*]+ \s+ )?
 			([0-9.]+) \s
-			/x or die "$_ ?";
+			/x or die "$cplex \n==\n $glpsol_out $_ ?";
 		if ($varname =~ m/^f(\d+)s(\d+)_/) {
 			my ($ix,$orgix) = ($1,$2);
 			my $flow= $flows[$ix] or die;