my @flow_conds;
my @query_params;
+my %dists;
my $sd_condition= sub {
my ($bs, $ix) = @_;
$sth->execute(@query_params);
my @flows;
+my $distquery= $dbh->prepare("
+ SELECT dist FROM dists WHERE aiid = ? AND biid = ?
+ ");
+my $distance= sub {
+ my ($from,$to)= @_;
+ my $d= $dists{$from}{$to};
+ return $d if defined $d;
+ $distquery->execute($from,$to);
+ $d = $distquery->fetchrow_array();
+ defined $d or die "$from $to ?";
+ $dists{$from}{$to}= $d;
+ return $d;
+};
+
my @cols= ({ NoSort => 1 });
my $addcols= sub {
qw( Margin
));
$addcols->({ DoReverse => 1 },
- qw( unitprofit MaxQty
+ qw( unitprofit dist MaxQty
MaxCapital MaxProfit
));
$f->{'dst_price'} * (1.0 - $loss_per_league) ** $f->{'dist'}
- $f->{'org_price'};
+ $dists{'org_id'}{'dst_id'}= $f->{'dist'};
+
my @uid= $f->{commodid};
foreach my $od (qw(org dst)) {
push @uid,
<colgroup span=2>
<colgroup span=2>
<colgroup span=2>
+<colgroup span=1>
<colgroup span=3>
% if ($optimise) {
<colgroup span=3>
<th colspan=2>Collect
<th colspan=2>Deliver
<th colspan=2>Profit
+<th colspan=1>
<th colspan=3>Max
% if ($optimise) {
<th colspan=3>Planned
<th>Qty
<th>Margin
<th>Unit
+<th>Dist
<th>Qty
<th>Capital
<th>Profit
<table rules=groups>
% foreach my $i (0..$#islandids) {
<tbody>
-<tr><td colspan=3><strong>
+<tr><td colspan=3>
% $iquery->execute($islandids[$i]);
% my ($islandname) = $iquery->fetchrow_array();
% if (!$i) {
-Start at <% $islandname |h %>
+<strong>Start at <% $islandname |h %></strong>
% } else {
-Sail to <% $islandname |h %>
+<strong>Sail to <% $islandname |h %></strong>
+- <% $distance->($islandids[$i-1],$islandids[$i]) |h %>leagues </td>
% }
-</strong>
<%perl>
my $age_reported= 0;
my %flowlists;