chiark
/
gitweb
/
~yarrgweb
/
ypp-sc-tools.main.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
b5f936b
)
WIP routesearch; change LP variable names in routetrade to be more like those in...
author
Ian Jackson
<ian@liberator.(none)>
Sat, 3 Oct 2009 20:38:21 +0000
(21:38 +0100)
committer
Ian Jackson
<ian@liberator.(none)>
Sat, 3 Oct 2009 20:38:21 +0000
(21:38 +0100)
yarrg/web/routetrade
patch
|
blob
|
history
diff --git
a/yarrg/web/routetrade
b/yarrg/web/routetrade
index d90bf40fb7afe7993c0f0924e4ea38c2e6dc2ba0..d7679f8762a872cb00f548dcc19af92b2f36a763 100644
(file)
--- a/
yarrg/web/routetrade
+++ b/
yarrg/web/routetrade
@@
-292,7
+292,11
@@
foreach my $f (@flows) {
Flow => $f,
Org => $sfi->[0],
Dst => $sfi->[1],
Flow => $f,
Org => $sfi->[0],
Dst => $sfi->[1],
- Var => sprintf "f%ss%s", $f->{Ix}, $sfi->[0]
+ Var => sprintf "f%ss%s_c%d_p%d_%d_p%d_%d",
+ $f->{Ix}, $sfi->[0],
+ $f->{'commodid'},
+ $sfi->[0], $f->{'org_price'},
+ $sfi->[1], $f->{'dst_price'}
};
push @{ $f->{Subflows} }, $subflow;
push @subflows, $subflow;
};
push @{ $f->{Subflows} }, $subflow;
push @subflows, $subflow;
@@
-420,10
+424,9
@@
foreach my $flow (@flows) {
}
foreach my $od (qw(org dst)) {
my $limname= join '_', (
}
foreach my $od (qw(org dst)) {
my $limname= join '_', (
- 'avail',
- $flow->{'commodid'},
$od,
$od,
- $flow->{"${od}_id"},
+ 'i'.$flow->{"${od}_id"},
+ 'c'.$flow->{'commodid'},
$flow->{"${od}_price"},
$flow->{"${od}_stallid"},
);
$flow->{"${od}_price"},
$flow->{"${od}_stallid"},
);
@@
-542,7
+545,7
@@
if ($qa->{'debug'}) {
(\w+) \s+ (?: [A-Z*]+ \s+ )?
([0-9.]+) \s
/x or die "$_ ?";
(\w+) \s+ (?: [A-Z*]+ \s+ )?
([0-9.]+) \s
/x or die "$_ ?";
- if ($varname =~ m/^f(\d+)s(\d+)
$
/) {
+ if ($varname =~ m/^f(\d+)s(\d+)
_
/) {
my ($ix,$orgix) = ($1,$2);
my $flow= $flows[$ix] or die;
my @relsubflow= grep { $_->{Org} == $orgix }
my ($ix,$orgix) = ($1,$2);
my $flow= $flows[$ix] or die;
my @relsubflow= grep { $_->{Org} == $orgix }