Show total distance

[ypp-sc-tools.db-live.git] / yarrg / web / routetrade

diff --git a/yarrg/web/routetrade b/yarrg/web/routetrade
index 074069d2b71b38a64d68897e9d5868f0b156dced..4885782e58a440b7a773510a049daf363e5e0838 100644 (file)
--- 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,
@@ -346,7 +365,7 @@ Route contains archipelago(es), not just specific islands.
 Route is complex - it visits the same island several times
 and isn't a simple loop.
 % }
-Therefore, optimal trade pattern not calculated.
+Therefore, optimal voyage trade plan not calculated.
 
 % } else { # ========== OPTMISATION ==========
 <%perl>
@@ -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">
 
@@ -558,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;
@@ -580,6 +600,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 +625,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;
        }
      }
 
@@ -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"