chiark
/
gitweb
/
~yarrgweb
/
ypp-sc-tools.db-test.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
85ff13e
)
routetrade: WIP fix unticked trades
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 25 Oct 2009 12:07:38 +0000
(12:07 +0000)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 25 Oct 2009 12:07:38 +0000
(12:07 +0000)
yarrg/web/routetrade
patch
|
blob
|
history
diff --git
a/yarrg/web/routetrade
b/yarrg/web/routetrade
index c7dd03e5d0166e63c4054ed3561450e8824ffff1..5dc5e774a40f8c839a26ef28c75d8c6b9bc7b31a 100644
(file)
--- 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 .= "
if ($flow->{Suppress}) {
foreach my $sf (@{ $flow->{Subflows} }) {
$cplex .= "
- $sf->{Var} = 0";
+ $sf->{Var} = 0
\n
";
}
next;
}
}
next;
}
@@
-554,7
+554,7
@@
if ($qa->{'debug'}) {
\s* \d+ \s+
(\w+) \s+ (?: [A-Z*]+ \s+ )?
([0-9.]+) \s
\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;
if ($varname =~ m/^f(\d+)s(\d+)_/) {
my ($ix,$orgix) = ($1,$2);
my $flow= $flows[$ix] or die;