chiark / gitweb /
routetrade: WIP fix unticked trades
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 25 Oct 2009 12:07:38 +0000 (12:07 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 25 Oct 2009 12:07:38 +0000 (12:07 +0000)
yarrg/web/routetrade

index c7dd03e..5dc5e77 100644 (file)
@@ -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;