X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2Fweb%2Froutetrade;h=4885782e58a440b7a773510a049daf363e5e0838;hb=cf9d0277c5d6bfe900a0881a00984f8268a90514;hp=ce91b48726c40f4a59da3f5d8ad40f2204fb1e12;hpb=767e625796d67e5f5cc94d7e1949b1389f753764;p=ypp-sc-tools.db-live.git

diff --git a/yarrg/web/routetrade b/yarrg/web/routetrade
index ce91b48..4885782 100644
--- a/yarrg/web/routetrade
+++ b/yarrg/web/routetrade
@@ -50,6 +50,7 @@ my $loss_per_league= 1e-7;
 
 my @flow_conds;
 my @query_params;
+my %dists;
 
 my $sd_condition= sub {
 	my ($bs, $ix) = @_;
@@ -161,6 +162,20 @@ my $sth= $dbh->prepare($stmt);
 $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 {
@@ -190,7 +205,7 @@ $addcols->({ DoReverse => 1, SortColKey => 'MarginSortKey' },
 	qw(	Margin
 	));
 $addcols->({ DoReverse => 1 },
-	qw(	unitprofit MaxQty
+	qw(	unitprofit dist MaxQty
 		MaxCapital MaxProfit
 	));
 
@@ -263,6 +278,8 @@ foreach my $f (@flows) {
 		$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,
@@ -469,6 +486,7 @@ $addcols->({ Total => 0, DoReverse => 1 }, qw(
 <colgroup span=2>
 <colgroup span=2>
 <colgroup span=2>
+<colgroup span=1>
 <colgroup span=3>
 %	if ($optimise) {
 <colgroup span=3>
@@ -481,6 +499,7 @@ $addcols->({ Total => 0, DoReverse => 1 }, qw(
 <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
@@ -497,6 +516,7 @@ $addcols->({ Total => 0, DoReverse => 1 }, qw(
 <th>Qty
 <th>Margin
 <th>Unit
+<th>Dist
 <th>Qty
 <th>Capital
 <th>Profit
@@ -555,20 +575,23 @@ $addcols->({ Total => 0, DoReverse => 1 }, qw(
 %				WHERE islandid = ?');
 % my %da_ages;
 % my $total_total= 0;
+% my $total_dist= 0;
 %
 <h1>Voyage trading plan</h1>
 <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();
+%	my $this_dist= $distance->($islandids[$i-1],$islandids[$i]);
+%	$total_dist += $this_dist;
 %	if (!$i) {
-Start at <% $islandname |h %>
+<strong>Start at <% $islandname |h %></strong>
 %	} else {
-Sail to <% $islandname |h %>
+<strong>Sail to <% $islandname |h %></strong>
+- <% $this_dist |h %> leagues </td>
 %	}
-</strong>
 <%perl>
      my $age_reported= 0;
      my %flowlists;
@@ -675,7 +698,7 @@ Sail to <% $islandname |h %>
 }
 </%perl>
 <tbody><tr>
-<td colspan=2>
+<td colspan=2>Total distance: <% $total_dist %> leagues.
 <td colspan=3 align=right>Overall net cash flow
 <td align=right><strong><%
   $total_total < 0 ? -$total_total." loss" : $total_total." gain"