X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2Fweb%2Froutetrade;h=7d112b730ae480e938db46648d28038d4b1cf443;hb=981103caa156882eb0728ffd99f86ca9e29c7887;hp=9fde77e7aa6783104b92fd80d636a0c0c45a970d;hpb=34203ee3033aeaa10eff8848ad869f5eeb1c789a;p=ypp-sc-tools.web-live.git

diff --git a/yarrg/web/routetrade b/yarrg/web/routetrade
index 9fde77e..7d112b7 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) = @_;
@@ -85,10 +86,12 @@ foreach my $src_i (0..$#islandids) {
 
 		if ($specific && !$confusing &&
 		    # With a circular route, do not carry goods round the loop
-		    !($src_i==0 && $dst_i==$#islandids &&
+		    !(($src_i==0 || $src_i==$#islandids) &&
+		      $dst_i==$#islandids &&
 		      $src_isle == $islandids[$dst_i])) {
 			if ($islandpair{$src_isle,$dst_isle}) {
 				$confusing= 1;
+print "confusing $src_i $src_isle  $dst_i $dst_isle\n";
 			} else {
 				$islandpair{$src_isle,$dst_isle}=
 					[ $src_i, $dst_i ];
@@ -159,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 {
@@ -188,7 +205,7 @@ $addcols->({ DoReverse => 1, SortColKey => 'MarginSortKey' },
 	qw(	Margin
 	));
 $addcols->({ DoReverse => 1 },
-	qw(	unitprofit MaxQty
+	qw(	unitprofit dist MaxQty
 		MaxCapital MaxProfit
 	));
 
@@ -261,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,
@@ -467,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>
@@ -479,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
@@ -495,6 +516,7 @@ $addcols->({ Total => 0, DoReverse => 1 }, qw(
 <th>Qty
 <th>Margin
 <th>Unit
+<th>Dist
 <th>Qty
 <th>Capital
 <th>Profit
@@ -540,15 +562,10 @@ $addcols->({ Total => 0, DoReverse => 1 }, qw(
 % }
 </table>
 
-<& tabsort, cols => \@cols, table => 'trades', rowclass => 'datarow',
+<&| tabsort, cols => \@cols, table => 'trades', rowclass => 'datarow',
 	throw => 'trades_sort', tbrow => 'trades_total' &>
-<&| script &>
   ts_sortkeys= <% to_json_protecttags(\%ts_sortkeys) %>;
-  function all_onload() {
-    ts_onload__trades();
-  }
-  window.onload= all_onload;
-</&script>
+</&tabsort>
 
 <input type=submit name=update value="Update">
 
@@ -563,15 +580,15 @@ $addcols->({ Total => 0, DoReverse => 1 }, qw(
 <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;
@@ -580,6 +597,11 @@ Sail to <% $islandname |h %>
 		next if $f->{Suppress};
 		next unless $f->{"${od}_id"} == $islandids[$i];
 		next unless $f->{OptQty};
+		my $arbitrage= $f->{'org_id'} == $f->{'dst_id'};
+		my $loop= $islandids[0] == $islandids[-1] &&
+			  ($i==0 || $i==$#islandids);
+		next if $loop and ($arbitrage ? $i :
+			!!$i == !!($od eq 'org'));
 		my $price= $f->{"${od}_price"};
 		my $stallname= $f->{"${od}_stallname"};
 		my $todo= \$flowlists{$od}{
@@ -600,9 +622,7 @@ Sail to <% $islandname |h %>
 		$$todo->{Qty} += $f->{OptQty};
 		$$todo->{Total}= $$todo->{Price} * $$todo->{Qty};
 		$$todo->{Stalls}= $f->{"${od}Stalls"};
-		if ($f->{'org_id'} == $f->{'dst_id'}) {
-			$$todo->{"${od}Arbitrage"}= 1;
-		}
+		$$todo->{"${od}Arbitrage"}= 1 if $arbitrage;
 	}
      }