chiark / gitweb /
Better doc
[ypp-sc-tools.db-live.git] / yarrg / web / routetrade
index d90bf40..03ef3e1 100644 (file)
@@ -38,25 +38,27 @@ $dbh
 @islandids
 @archipelagoes
 $qa
-$max_mass
-$max_volume
-$lossperleaguepct
-$max_capital
+$routeparams
+$reset_suppressions
+$quri
 </%args>
-<&| script &>
-  da_pageload= Date.now();
-</&script>
+<& query_age:pageload &>
 
 <%perl>
 
-my $loss_per_league= defined $lossperleaguepct ? $lossperleaguepct*0.01 : 1e-7;
+my $loss_per_league= defined $routeparams->{LossPerLeaguePct}
+       ? $routeparams->{LossPerLeaguePct}*0.01 : 1e-7;
 my $loss_per_delay_slot= 1e-8;
+my $max_gems= 24;
+
+my $minprofit= $routeparams->{MinProfit} || 0;
 
 my $now= time;
 
 my @flow_conds;
 my @query_params;
 my %dists;
+my $expected_total_profit;
 
 my $sd_condition= sub {
        my ($bs, $ix) = @_;
@@ -143,6 +145,10 @@ my $stmt= "
                commods.commodid                                commodid,
                commods.unitmass                                unitmass,
                commods.unitvolume                              unitvolume,
+               commods.ordval                                  ordval,
+               commods.posinclass                              posinclass,
+               commods.commodclassid                           commodclassid,
+               commods.flags                                   flags,
                dist                                            dist,
                buy.price - sell.price                          unitprofit
        FROM commods
@@ -264,15 +270,32 @@ foreach my $v (qw(MaxMass MaxVolume)) {
 <& dumptable:end, qa => $qa &>
 % }
 
-<%perl>
+% if (@islandids==1) {
+%      if (defined $islandids[0]) {
+Searched for arbitrage trades only.
+%      } else {
+Searched for arbitrage trades only, in <% $archipelagoes[0] |h %>
+<a href="docs#arbitrage">[?]</a>.
+%      }
+% }
 
-my @sail_total;
+<%perl>
 
 if (!@flows) {
        print 'No profitable trading opportunities were found.';
        return;
 }
 
+my @sail_total;
+my %opportunity_value;
+
+my $oppo_key= sub {
+       my ($f) = @_;
+       return join '_', map { $f->{$_} } qw(org_id dst_id commodid);
+};
+
+my $any_previous_suppression= 0;
+
 foreach my $f (@flows) {
 
        $f->{MaxQty}= $f->{'org_qty_agg'} < $f->{'dst_qty_agg'}
@@ -286,18 +309,6 @@ foreach my $f (@flows) {
                $f->{"Max$v"}= sprintf "%.1f", $f->{"Max${v}SortKey"} * 1e-6;
        }
 
-       my $sfis= $ipair2subflowinfs{$f->{'org_id'},$f->{'dst_id'}};
-       foreach my $sfi (@$sfis) {
-               my $subflow= {
-                       Flow => $f,
-                       Org => $sfi->[0],
-                       Dst => $sfi->[1],
-                       Var => sprintf "f%ss%s", $f->{Ix}, $sfi->[0]
-               };
-               push @{ $f->{Subflows} }, $subflow;
-               push @subflows, $subflow;
-       }
-
        $f->{MarginSortKey}= sprintf "%d",
                $f->{'dst_price'} * 10000 / $f->{'org_price'};
        $f->{Margin}= sprintf "%3.1f%%",
@@ -309,6 +320,8 @@ foreach my $f (@flows) {
 
        $dists{'org_id'}{'dst_id'}= $f->{'dist'};
 
+       $opportunity_value{ $oppo_key->($f) } += $f->{MaxProfit};
+
        my @uid= $f->{commodid};
        foreach my $od (qw(org dst)) {
                push @uid,
@@ -371,22 +384,59 @@ foreach my $f (@flows) {
                $f->{UidLong} eq $recons_long or
                        die "$f->{UidLong} = $f->{UidShort} = $recons_long ?";
        }
+}
 
-       if (defined $qa->{"R$f->{UidShort}"} &&
-           !defined $qa->{"T$f->{UidShort}"}) {
-               $f->{Suppress}= 1;
-       }
+foreach my $f (@flows) {
 
+       if ($reset_suppressions || !defined $qa->{"R$f->{UidShort}"}) {
+               if ($opportunity_value{ $oppo_key->($f) } < $minprofit) {
+                       $f->{Suppress}= 1;
+               }
+       } else {
+               if (!defined $qa->{"T$f->{UidShort}"}) {
+                       $any_previous_suppression= 1;
+                       $f->{Suppress}= 1;
+               }
+       }
+       if (!$f->{Suppress}) {
+               my $sfis= $ipair2subflowinfs{$f->{'org_id'},$f->{'dst_id'}};
+               foreach my $sfi (@$sfis) {
+                       my $subflow= {
+                               Flow => $f,
+                               Org => $sfi->[0],
+                               Dst => $sfi->[1],
+                               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;
+               }
+       }
 }
 </%perl>
 
-% my $optimise= $specific;
-% if (!$optimise) {
+% my $optimise= 1;
+% my $opt_how;
 
-<p>
 % if (!$specific) {
+%      $optimise= 0;
 Route contains archipelago(es), not just specific islands.
+% } elsif (!@subflows) {
+%      $optimise= 0;
+%      if ($any_previous_suppression) {
+All available trades deselected.
+%      } else {
+No available trades meet the specified minimum trade value, so
+all available trades deselected.
+%      }
 % }
+
+% if (!$optimise) {
+
+<p>
 Therefore, optimal voyage trade plan not calculated.
 
 % } else { # ========== OPTMISATION ==========
@@ -398,11 +448,17 @@ Maximize
   totalprofit:
 ";
 
+my %stall_poe_limits;
+
 foreach my $sf (@subflows) {
        my $eup= $sf->{Flow}{ExpectedUnitProfit};
        $eup *= (1.0-$loss_per_delay_slot) ** $sf->{Org};
        $cplex .= sprintf "
                %+.20f %s", $eup, $sf->{Var};
+       if ($qa->{ShowStalls}>=2) {
+               my $stall= $sf->{Flow}{'dst_stallid'};
+               push @{ $stall_poe_limits{$stall} }, $sf;
+       }
 }
 $cplex .= "
 
@@ -411,19 +467,12 @@ Subject To
 
 my %avail_lims;
 foreach my $flow (@flows) {
-       if ($flow->{Suppress}) {
-               foreach my $sf (@{ $flow->{Subflows} }) {
-                       $cplex .= "
-   $sf->{Var} = 0";
-               }
-               next;
-       }
+       next if $flow->{Suppress};
        foreach my $od (qw(org dst)) {
                my $limname= join '_', (
-                       'avail',
-                       $flow->{'commodid'},
                        $od,
-                       $flow->{"${od}_id"},
+                       'i'.$flow->{"${od}_id"},
+                       'c'.$flow->{'commodid'},
                        $flow->{"${od}_price"},
                        $flow->{"${od}_stallid"},
                );
@@ -457,14 +506,15 @@ foreach my $ci (0..($#islandids-1)) {
        }
 #print " RELEVANT $ci COUNT ".scalar(@rel_subflows)."  ";
        if (!@rel_subflows) {
-               foreach my $mv (qw(mass volume)) {
+               foreach my $mv (qw(mass volume capital)) {
                        $sail_total[$ci]{$mv}= 0;
                }
                next;
        }
 
        my $applylimit= sub {
-               my ($mv, $max, $f2val) = @_;
+               my ($mv, $f2val) = @_;
+               my $max= $routeparams->{"Max".ucfirst $mv};
                $max= 1e9 unless defined $max;
 #print " DEFINED MAX $mv $max ";
                $cplex .= "
@@ -476,9 +526,35 @@ foreach my $ci (0..($#islandids-1)) {
                " <= $max";
        };
 
-       $applylimit->('mass',   $max_mass,   sub { $_[0]{'unitmass'}  *1e-3 });
-       $applylimit->('volume', $max_volume, sub { $_[0]{'unitvolume'}*1e-3 });
-       $applylimit->('capital',$max_capital,sub { $_[0]{'org_price'}       });
+       $applylimit->('mass',    sub { $_[0]{'unitmass'}  *1e-3 });
+       $applylimit->('volume',  sub { $_[0]{'unitvolume'}*1e-3 });
+       $applylimit->('capital', sub { $_[0]{'org_price'}       });
+
+       my @gem_subflows= grep { $_->{Flow}{flags} =~ m/g/ } @rel_subflows;
+       if (@gem_subflows) {
+               $cplex .= "
+   ". sprintf("%-10s","gems_$ci:")." ".
+               join(" + ", map { $_->{Var} } @gem_subflows). " <= $max_gems";
+       }
+
+       $cplex.= "\n";
+}
+
+if ($qa->{ShowStalls}>=2) {
+       my $stallpoe= $dbh->prepare(<<END);
+SELECT max(qty*price) FROM buy WHERE stallid=?
+END
+       foreach my $stallid (sort { $a <=> $b } keys %stall_poe_limits) {
+               $stallpoe->execute($stallid);
+               my ($lim)= $stallpoe->fetchrow_array();
+               $stallpoe->finish();
+               $cplex.= "
+    ". sprintf("%-15s","poe_$stallid:")." ".
+               join(" + ", map {
+                       sprintf "%d %s", $_->{Flow}{'dst_price'}, $_->{Var};
+               } @{ $stall_poe_limits{$stallid} }).
+               " <= $lim";
+       }
        $cplex.= "\n";
 }
 
@@ -505,16 +581,23 @@ if ($qa->{'debug'}) {
 <%perl>
 }
 
-{
+my $try_solve= sub {
+       my ($how, @opts) = @_;
        my $input= pipethrough_prep();
        print $input $cplex or die $!;
        my $output= pipethrough_run_along($input, undef, 'glpsol',
-               qw(glpsol --tmlim 2 --memlim 5 --intopt --cuts --bfs
-                         --cpxlp /dev/stdin -o /dev/stdout));
-       print "<pre>\n" if $qa->{'debug'};
+               qw(glpsol --tmlim 5 --memlim 20), @opts,
+               qw( --cpxlp /dev/stdin -o /dev/stdout));
+       if ($qa->{'debug'}) {
+               print "<h3>@opts</h3>\n<pre>\n";
+       }
+       $expected_total_profit= undef;
+       $_->{OptQty}= undef foreach @subflows;
        my $found_section= 0;
        my $glpsol_out= '';
        my $continuation='';
+       my $timelimit= 0;
+       my $somemip= 0;
        while (<$output>) {
                $glpsol_out.= $_;
                print encode_entities($_) if $qa->{'debug'};
@@ -523,6 +606,17 @@ if ($qa->{'debug'}) {
                        $found_section= 1;
                        next;
                }
+               if ((m/^Integer optimization begins/ .. 0) &&
+                   m/^\+ \s* \d+\: \s* mip \s* = \s* \d/) {
+                       $somemip= 1;
+                       next;
+               }
+               if (m/^TIME LIMIT EXCEEDED/) {
+                       $timelimit= 1;
+               }
+               if (m/^Objective:\s+totalprofit = (\d+(?:\.\d*)?) /) {
+                       $expected_total_profit= $1;
+               }
                next unless $found_section==1;
                if (!length $continuation) {
                        next if !$continuation &&  m/^[- ]+$/;
@@ -540,9 +634,9 @@ if ($qa->{'debug'}) {
                my ($varname, $qty) = m/^
                        \s* \d+ \s+
                        (\w+) \s+ (?: [A-Z*]+ \s+ )?
-                       ([0-9.]+) \s
-                       /x or die "$_ ?";
-               if ($varname =~ m/^f(\d+)s(\d+)$/) {
+                       ([-+0-9]+)(?: [.e][-+e0-9.]* )? \s
+                       /x or die "$cplex \n==\n $glpsol_out $_ ?";
+               if ($varname =~ m/^f(\d+)s(\d+)_/) {
                        my ($ix,$orgix) = ($1,$2);
                        my $flow= $flows[$ix] or die;
                        my @relsubflow= grep { $_->{Org} == $orgix }
@@ -552,7 +646,7 @@ if ($qa->{'debug'}) {
                        $sf->{OptQty}= $qty;
                        $sf->{OptProfit}= $qty * $flow->{'unitprofit'};
                        $sf->{OptCapital}= $qty * $flow->{'org_price'};
-               } elsif ($varname =~ m/^(mass|volume)_(\d+)$/) {
+               } elsif ($varname =~ m/^(mass|volume|capital)_(\d+)$/) {
                        my ($mv,$ix) = ($1,$2);
                        $sail_total[$ix]{$mv}= $qty;
                }
@@ -561,8 +655,29 @@ if ($qa->{'debug'}) {
        my $prerr= "\n=====\n$cplex\n=====\n$glpsol_out\n=====\n ";
        pipethrough_run_finish($output,$prerr);
        map { defined $_->{OptQty} or die "$prerr $_->{Flow}{Ix}" } @subflows;
+       defined $expected_total_profit or die "$prerr ?";
+       return 0 unless $somemip || !$timelimit;
+       $opt_how= $how;
+       return 1;
 };
 
+unless ($try_solve->('Optimisation successful',
+                    qw( --intopt --cuts --bfs )) or
+       $try_solve->('<strong>Complex problem, downgraded</strong>'.
+                    ' to rounded-down LP.',
+                    qw( --nomip ))) {
+</%perl>
+<h2>Optimisation failed</h2>
+The linear/mixed-integer optimisation failed.
+Please report this problem.
+
+<pre>
+<% $cplex |h %>
+</pre>
+<%perl>
+       return;
+}
+
 $addcols->({ DoReverse => 1, TotalSubflows => 1, Special => sub {
        my ($flow,$col,$v,$spec) = @_;
        if ($flow->{ExpectedUnitProfit} < 0) {
@@ -581,11 +696,368 @@ $addcols->({ Total => 0, DoReverse => 1, TotalSubflows => 1 }, qw(
 
 % } # ========== OPTIMISATION ==========
 
-% my %ts_sortkeys;
-% {
+% if (!printable($m)) {
+<h2>Contents</h2>
+<ul>
+% if ($optimise) {
+ <li><a href="#summary">Summary</a>
+ <li><a href="#plan">Voyage trading plan</a>
+  <ul>
+   <li>Printable:
+         <input type=submit name=printable_pdf value="PDF">
+         <input type=submit name=printable_html value="HTML">
+         <input type=submit name=printable_ps value="PostScript">
+         <input type=submit name=printable_pdf2 value="PDF 2-up">
+         <input type=submit name=printable_ps2 value="PostScript 2-up">
+  </ul>
+% }
+ <li><a href="#dataage">Relevant data ages</a>
+ <li><a href="#trades">Relevant trades</a>
+</ul>
+% } else {
+%      my @tl= gmtime $now or die $!;
+<p>
+Generated by YARRG at <strong><%
+       sprintf "%04d-%02d-%02d %02d:%02d:%02d UTC",
+               $tl[5]+1900, @tl[4,3,2,1,0]
+                       |h %></strong>.
+% }
+
+% if ($optimise) { # ========== TRADING PLAN ==========
+<%perl>
+my $iquery= $dbh->prepare('SELECT islandname FROM islands
+                               WHERE islandid = ?');
+my %da_ages;
+my $total_total= 0;
+my $total_dist= 0;
+my @oldest= (-1, 'nowhere');
+my $plan_html= '';
+
+my $plan_table_info= printable($m) ? 'width=100%' : '';
+$plan_html .= <<END;
+<table class="data" rules=groups $plan_table_info >
+END
+
+my $tbody= sub {
+       if (!printable($m)) { return '<tbody>'; }
+       my ($c)= qw(40 00)[$_[0]];
+       return "<tr><td bgcolor=\"#${c}${c}${c}\" height=1 colspan=7>";
+};
+
+foreach my $i (0..$#islandids) {
+     $plan_html .= $tbody->(1);
+     $plan_html .= "<tr>\n";
+     $iquery->execute($islandids[$i]);
+     my ($islandnamepr)= encode_entities( $iquery->fetchrow_array() );
+       
+     if (!$i) {
+               $plan_html .= <<END;
+<td colspan=2>
+<strong>Start at $islandnamepr</strong>
+<td colspan=2><a href="docs#posinclass">[what are these codes?]</a>
+<td>
+END
+     } else {
+               my $this_dist= $distance->($islandids[$i-1],$islandids[$i]);
+               $total_dist += $this_dist;
+               $plan_html .= <<END;
+<td colspan=5>
+END
+               my $total_value= 0;
+               foreach my $sf (@subflows) {
+                       next unless $sf->{Org} < $i && $sf->{Dst} >= $i;
+                       $total_value +=
+                               $sf->{OptQty} * $sf->{Flow}{'dst_price'};
+               }
+               $plan_html .= <<END;
+<strong>Sail to $islandnamepr</strong>
+- $this_dist leagues, $total_value poe at risk
+ </td>
+END
+     }
+     my $age_reported= 0;
+     my %flowlists;
+     #print "<tr><td colspan=7>" if $qa->{'debug'};
+     foreach my $od (qw(org dst)) {
+       #print " [[ i $i od $od " if $qa->{'debug'};
+       foreach my $sf (@subflows) {
+               my $f= $sf->{Flow};
+               next unless $sf->{ucfirst $od} == $i;
+               #print " FLOW $f->{Ix} SUB #$sf->{Org}..$sf->{Dst} "
+               #       if $qa->{'debug'};
+               next unless $sf->{OptQty};
+               my $arbitrage= $f->{'org_id'} == $f->{'dst_id'};
+               die if $arbitrage and $sf->{Org} != $sf->{Dst};
+               my $price= $f->{"${od}_price"};
+               my $stallname= $f->{"${od}_stallname"};
+               my $todo= \$flowlists{$od}{
+                               (sprintf "%010d", $f->{'ordval'}),
+                               $f->{'commodname'},
+                               (sprintf "%07d", ($od eq 'dst' ?
+                                               9999999-$price : $price)),
+                               $stallname
+                       };
+               $$todo= {
+                       Qty => 0,
+                       orgArbitrage => 0,
+                       dstArbitrage => 0,
+               } unless $$todo;
+               $$todo->{'commodid'}= $f->{'commodid'};
+               $$todo->{'commodname'}= $f->{'commodname'};
+               $$todo->{'posinclass'}= '';
+               my $incl= $f->{'posinclass'};
+
+               my $findclass= $dbh->prepare(<<END);
+SELECT commodclass, maxposinclass FROM commodclasses WHERE commodclassid = ?
+END
+               $findclass->execute($f->{'commodclassid'});
+               my $classinfo= $findclass->fetchrow_hashref();
+               if ($classinfo) {
+                       my $clname= $classinfo->{'commodclass'};
+                       my $desc= encode_entities(sprintf "%s is under %s",
+                                       $f->{'commodname'}, $clname);
+                       my $abbrev= substr($clname,0,1);
+                       if ($incl) {
+                               my $maxpic= $classinfo->{'maxposinclass'};
+                               $desc.= (sprintf ", commodity %d of %d",
+                                       $incl, $maxpic);
+                               if ($classinfo->{'maxposinclass'} >= 8) {
+                                       my @tmbs= qw(0 1 2 3 4 5 6 7 8 9);
+                                       my $tmbi= ($incl+0.5)*$#tmbs/$maxpic;
+                                       $abbrev.= " ".$tmbs[$tmbi]."&nbsp;";
+                               }
+                       }
+                       $$todo->{'posinclass'}=
+                               "<div class=mouseover title=\"$desc\">"
+                               .$abbrev."</div>";
+               }
+               $$todo->{'stallname'}= $stallname;
+               $$todo->{Price}= $price;
+               $$todo->{Timestamp}= $f->{"${od}_timestamp"};
+               $$todo->{Qty} += $sf->{OptQty};
+               $$todo->{Total}= $$todo->{Price} * $$todo->{Qty};
+               $$todo->{Stalls}= $f->{"${od}Stalls"};
+               $$todo->{"${od}Arbitrage"}= 1 if $arbitrage;
+       }
+       #print "]] " if $qa->{'debug'};
+     }
+     #print "</tr>" if $qa->{'debug'};
+
+     my ($total, $total_to_show);
+     my $dline= 0;
+     my $show_total= sub {
+       my ($totaldesc, $sign) = @_;
+       if (defined $total) {
+               die if defined $total_to_show;
+               $total_total += $sign * $total;
+               $total_to_show= [ $totaldesc, $total ];
+               $total= undef;
+       }
+       $dline= 0;
+     };
+     my $show_total_now= sub {
+       my ($xinfo) = @_;
+       return unless defined $total_to_show;
+       my ($totaldesc,$totalwas) = @$total_to_show;
+       $plan_html .= <<END;
+<tr>
+<td colspan=1>
+<td colspan=3>$xinfo
+<td colspan=2 align=right>$totaldesc
+<td align=right>$totalwas total
+END
+       $total_to_show= undef;
+     };
+     my $show_flows= sub {
+       my ($od,$arbitrage,$collectdeliver) = @_;
+       my $todo= $flowlists{$od};
+       return unless $todo;
+       foreach my $tkey (sort keys %$todo) {
+               my $t= $todo->{$tkey};
+               next if $t->{"${od}Arbitrage"} != $arbitrage;
+               $show_total_now->('');
+               if (!$age_reported++) {
+                       my $age= $now - $t->{Timestamp};
+                       @oldest= ($age,$islandnamepr) if $oldest[0] < $age;
+                       my $cellid= "da_${i}";
+                       my $agepr= prettyprint_age($age);
+                       $da_ages{$cellid}= $age;
+                       $plan_html .= <<END
+<td colspan=2>(Data age: <span id="$cellid">$agepr</span>)
+END
+               } elsif (!defined $total) {
+                       $total= 0;
+                       $plan_html .= $tbody->(0);
+               }
+               $total += $t->{Total};
+               my $span= 0 + keys %{ $t->{Stalls} };
+               my $td= "td rowspan=$span";
+               my %linkqf= (%{ $qa->{'baseqf'} }, %{ $qa->{'queryqf'} });
+               $linkqf{'query'}= 'commod';
+               $linkqf{'commodstring'}= $t->{'commodname'};
+               $linkqf{'commodid'}= $t->{'commodid'};
+               my $linkqfpr= encode_entities( $quri->(%linkqf) );
+               my $commodnamepr= encode_entities($t->{'commodname'});
+               $plan_html .= tr_datarow_s($m,$dline) . <<END;
+<$td>$collectdeliver
+<$td><a href="$linkqfpr">$commodnamepr</a>
+<$td>$t->{'posinclass'}
+END
+               my @stalls= sort keys %{ $t->{Stalls} };
+               my $pstall= sub {
+                       my $namepr= encode_entities( $stalls[$_[0]] );
+                       $plan_html .= <<END;
+<td>$namepr
+END
+               };
+
+               $pstall->(0);
+               $plan_html .= <<END;
+<$td align=right>$t->{Price} poe ea.
+<$td align=right>$t->{Qty} unit(s)
+<$td align=right>$t->{Total} total
+END
+               foreach my $stallix (1..$#stalls) {
+                       $plan_html .= tr_datarow_s($m,$dline);
+                       $pstall->($stallix);
+               }
+
+               $dline ^= 1;
+       }
+     };
+
+     $show_flows->('dst',0,'Deliver'); $show_total->('Proceeds',1);
+     $show_flows->('org',1,'Collect'); $show_total->('(Arbitrage) outlay',-1);
+     $show_flows->('dst',1,'Deliver'); $show_total->('(Arbitrage) proceeds',1);
+     $show_flows->('org',0,'Collect'); $show_total->('Outlay',-1);
+     my $totals= '';
+     if ($i < $#islandids) {
+       $totals .=      "In hold $sail_total[$i]{mass}kg,".
+                       " $sail_total[$i]{volume} l";
+       my $delim= '; spare ';
+       my $domv= sub {
+               my ($max, $got, $units) = @_;
+               return unless defined $max;
+               $totals .= $delim;
+               $totals .= sprintf "%g %s", ($max-$got), $units;
+               $delim= ', ';
+       };
+       $domv->($routeparams->{MaxMass},   $sail_total[$i]{mass},   'kg');
+       $domv->($routeparams->{MaxVolume}, $sail_total[$i]{volume}, 'l');
+       $totals .= ".\n";
+     }
+     $show_total_now->($totals);
+}
+
+my $cashflowpr= $total_total < 0
+               ? -$total_total." loss"
+               : $total_total." gain";
+
+my $max_capital= 0;
+foreach my $cap (map { $_->{capital} } @sail_total) {
+       $max_capital= $cap if $cap > $max_capital;
+}
+
+$da_ages{'oldest'}= $oldest[0];
+
+$plan_html .= $tbody->(1) . <<END;
+<tr>
+<td colspan=3>Total distance: $total_dist leagues.
+<td colspan=3 align=right>Overall net cash flow
+<td align=right><strong>$cashflowpr</strong>
+</table>
+END
+
+</%perl>
+% if (!printable($m)) {
+<h2><a name="summary">Summary</a></h2>
+% }
+
+<table>
+<tr>
+ <td>Distance:
+ <td><strong><% $total_dist %></strong> leagues,
+     <strong><% scalar(@islandids) %></strong> island(s)
+<tr>
+ <td>Planned net cash flow:
+ <td><strong><% $cashflowpr %></strong>
+<tr>
+ <td>Expected profit on average: approx.
+ <td>
+  <strong><% sprintf "%d", $expected_total_profit %></strong> poe
+  (considering expected losses, but ignoring rum consumed)
+<tr>
+ <td>Capital required:
+ <td>
+  <strong><% $max_capital %></strong> poe or less
+<tr>
+ <td>Oldest market data used:
+ <td><strong id="oldest"><% prettyprint_age($oldest[0]) %></strong>
+     (<% $oldest[1] %>)
+<tr>
+ <td colspan=2><% $opt_how %>
+</table>
+<p>
+
+<h2><a name="plan">Voyage trading plan</a></h2>
+<% $plan_html %>
+<& query_age:dataages, id2age => \%da_ages &>
+%
+% } # ========== TRADING PLAN ==========
+
+% if (!printable($m)) {
+<h2><a name="dataage">Relevant data ages</a></h2>
+<%perl>
+       my $sth_i= $dbh->prepare(<<END);
+               SELECT archipelago, islandid, islandname, timestamp
+                       FROM uploads NATURAL JOIN islands
+                       WHERE islandid = ?
+END
+       my $sth_a= $dbh->prepare(<<END);
+               SELECT archipelago, islandid, islandname, timestamp
+                       FROM uploads NATURAL JOIN islands
+                       WHERE archipelago = ?
+                       ORDER BY islandname
+END
+       my $ix=$#islandids;
+       my $sth_current;
+       my %idone;
+       my $fetchrow= sub {
+               for (;;) {
+                       if ($sth_current) {
+                               my $row= $sth_current->fetchrow_hashref();
+                               if ($row) {
+                                       next if $idone{$row->{'islandid'}}++;
+                                       return $row;
+                               }
+                       }
+                       return undef if $ix < 0;
+                       my $iid= $islandids[$ix];
+                       if (defined $iid) {
+                               $sth_i->execute($iid);
+                               $sth_current= $sth_i;
+                       } else {
+                               my $arch= $archipelagoes[$ix];
+                               die unless defined $arch && length $arch;
+                               $sth_a->execute($arch);
+                               $sth_current= $sth_a;
+                       }
+                       $ix--;
+               }
+       };
+</%perl>
+<&| query_age:agestable, now => $now, fetchrow => $fetchrow &>
+Islands shown in reverse order of visits.<br>
+</&>
+% }
+
+% if (!printable($m)) {
+%   my %ts_sortkeys;
+%   {
 %      my $cdspan= $qa->{ShowStalls} ? ' colspan=2' : '';
 %      my $cdstall= $qa->{ShowStalls} ? '<th>Stall</th>' : '';
-<table id="trades" rules=groups>
+<h2><a name="trades">Relevant trades</a></h2>
+<table class="data" id="trades" rules=groups>
 <colgroup span=1>
 <colgroup span=2>
 <% $qa->{ShowStalls} ? '<colgroup span=2>' : '' %>
@@ -598,7 +1070,7 @@ $addcols->({ Total => 0, DoReverse => 1, TotalSubflows => 1 }, qw(
 %      if ($optimise) {
 <colgroup span=3>
 %      }
-<tr class="spong">
+<tr>
 <th>
 <th<% $cdspan %>>Collect
 <th<% $cdspan %>>Deliver
@@ -635,14 +1107,14 @@ $addcols->({ Total => 0, DoReverse => 1, TotalSubflows => 1 }, qw(
 <th>Capital
 <th>Profit
 %      }
-% }
+%   }
 
 <tr id="trades_sort">
-% foreach my $col (@cols) {
+%   foreach my $col (@cols) {
 <th>
-% }
+%   }
 
-% foreach my $flowix (0..$#flows) {
+%   foreach my $flowix (0..$#flows) {
 %      my $flow= $flows[$flowix];
 %      my $rowid= "id_row_$flow->{UidShort}";
 <tr id="<% $rowid %>" class="datarow<% $flowix & 1 %>">
@@ -676,205 +1148,27 @@ $addcols->({ Total => 0, DoReverse => 1, TotalSubflows => 1 }, qw(
  %>><% exists $spec->{String} ? $spec->{String} : $v |h %>
 %              $ci += $spec->{Span};
 %      }
-% }
+%   }
 <tr id="trades_total">
 <th>
 <th colspan=2>Total
-% foreach my $ci (3..$#cols) {
+%   foreach my $ci (3..$#cols) {
 %      my $col= $cols[$ci];
 <td align=right>
 %      if (defined $col->{Total}) {
 <% $col->{Total} |h %>
 %      }
-% }
+%   }
 </table>
 
 <&| tabsort, cols => \@cols, table => 'trades', rowclass => 'datarow',
        throw => 'trades_sort', tbrow => 'trades_total' &>
   ts_sortkeys= <% to_json_protecttags(\%ts_sortkeys) %>;
 </&tabsort>
-
+<p>
 <input type=submit name=update value="Update">
 
-% if ($optimise) { # ========== TRADING PLAN ==========
-%
-% my $iquery= $dbh->prepare('SELECT islandname FROM islands
-%                              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=4>
-%      $iquery->execute($islandids[$i]);
-%      my ($islandname) = $iquery->fetchrow_array();
-%      if (!$i) {
-<strong>Start at <% $islandname |h %></strong>
-%      } else {
-%              my $this_dist= $distance->($islandids[$i-1],$islandids[$i]);
-%              $total_dist += $this_dist;
-<%perl>
-               my $total_value= 0;
-               foreach my $sf (@subflows) {
-                       next unless $sf->{Org} < $i && $sf->{Dst} >= $i;
-                       $total_value +=
-                               $sf->{OptQty} * $sf->{Flow}{'dst_price'};
-               }
-</%perl>
-<strong>Sail to <% $islandname |h %></strong>
-- <% $this_dist |h %> leagues,
- <% $total_value %>poe at risk
- </td>
-%      }
-<%perl>
-     my $age_reported= 0;
-     my %flowlists;
-     #print "<tr><td colspan=6>" if $qa->{'debug'};
-     foreach my $od (qw(org dst)) {
-       #print " [[ i $i od $od " if $qa->{'debug'};
-       foreach my $sf (@subflows) {
-               my $f= $sf->{Flow};
-               next if $f->{Suppress};
-               next unless $sf->{ucfirst $od} == $i;
-               #print " FLOW $f->{Ix} SUB #$sf->{Org}..$sf->{Dst} "
-               #       if $qa->{'debug'};
-               next unless $sf->{OptQty};
-               my $arbitrage= $f->{'org_id'} == $f->{'dst_id'};
-               die if $arbitrage and $sf->{Org} != $sf->{Dst};
-               my $price= $f->{"${od}_price"};
-               my $stallname= $f->{"${od}_stallname"};
-               my $todo= \$flowlists{$od}{
-                               $f->{'commodname'},
-                               (sprintf "%07d", ($od eq 'dst' ?
-                                               9999999-$price : $price)),
-                               $stallname
-                       };
-               $$todo= {
-                       Qty => 0,
-                       orgArbitrage => 0,
-                       dstArbitrage => 0,
-               } unless $$todo;
-               $$todo->{'commodname'}= $f->{'commodname'};
-               $$todo->{'stallname'}= $stallname;
-               $$todo->{Price}= $price;
-               $$todo->{Timestamp}= $f->{"${od}_timestamp"};
-               $$todo->{Qty} += $sf->{OptQty};
-               $$todo->{Total}= $$todo->{Price} * $$todo->{Qty};
-               $$todo->{Stalls}= $f->{"${od}Stalls"};
-               $$todo->{"${od}Arbitrage"}= 1 if $arbitrage;
-       }
-       #print "]] " if $qa->{'debug'};
-     }
-     #print "</tr>" if $qa->{'debug'};
-
-     my ($total, $total_to_show);
-     my $dline= 0;
-     my $show_total= sub {
-       my ($totaldesc, $sign) = @_;
-       if (defined $total) {
-               die if defined $total_to_show;
-               $total_total += $sign * $total;
-               $total_to_show= [ $totaldesc, $total ];
-               $total= undef;
-       }
-       $dline= 0;
-     };
-     my $show_total_now= sub {
-       my ($xinfo) = @_;
-       return unless defined $total_to_show;
-       my ($totaldesc,$totalwas) = @$total_to_show;
-</%perl>
-<tr>
-<td colspan=1>
-<td colspan=2><% $xinfo %>
-<td colspan=2 align=right><% $totaldesc %>
-<td align=right><% $totalwas |h %> total
-<%perl>
-       $total_to_show= undef;
-     };
-</%perl>
-%    my $show_flows= sub {
-%      my ($od,$arbitrage,$collectdeliver) = @_;
-%      my $todo= $flowlists{$od};
-%      return unless $todo;
-%      foreach my $tkey (sort keys %$todo) {
-%              my $t= $todo->{$tkey};
-%              next if $t->{"${od}Arbitrage"} != $arbitrage;
-%              $show_total_now->('');
-%              if (!$age_reported++) {
-%                      my $age= $now - $t->{Timestamp};
-%                      my $cellid= "da_${i}";
-%                      $da_ages{$cellid}= $age;
-<td colspan=2>\
-(Data age: <span id="<% $cellid %>"><% prettyprint_age($age) %></span>)
-%              } elsif (!defined $total) {
-%                      $total= 0;
-<tbody>
-%              }
-%              $total += $t->{Total};
-%              my $span= 0 + keys %{ $t->{Stalls} };
-%              my $td= "td rowspan=$span";
-<tr class="datarow<% $dline %>">
-<<% $td %>><% $collectdeliver %>
-<<% $td %>><% $t->{'commodname'} |h %>
-%
-%              my @stalls= sort keys %{ $t->{Stalls} };
-%              my $pstall= sub {
-%                      my $name= $stalls[$_[0]];
-<td><% $name |h %>
-%              };
-%
-%              $pstall->(0);
-<<% $td %> align=right><% $t->{Price} |h %> poe ea.
-<<% $td %> align=right><% $t->{Qty} |h %> unit(s)
-<<% $td %> align=right><% $t->{Total} |h %> total
-%
-%              foreach my $stallix (1..$#stalls) {
-<tr class="datarow<% $dline %>">
-%                      $pstall->($stallix);
-%              }
-%
-%              $dline ^= 1;
-%      }
-%    };
-<%perl>
-
-     $show_flows->('dst',0,'Deliver'); $show_total->('Proceeds',1);
-     $show_flows->('org',1,'Collect'); $show_total->('(Arbitrage) outlay',-1);
-     $show_flows->('dst',1,'Deliver'); $show_total->('(Arbitrage) proceeds',1);
-     $show_flows->('org',0,'Collect'); $show_total->('Outlay',-1);
-     my $totals= '';
-     if ($i < $#islandids) {
-       $totals .=      "In hold $sail_total[$i]{mass}kg,".
-                       " $sail_total[$i]{volume} l";
-       my $delim= '; spare ';
-       my $domv= sub {
-               my ($max, $got, $units) = @_;
-               return unless defined $max;
-               $totals .= $delim;
-               $totals .= sprintf "%g %s", ($max-$got), $units;
-               $delim= ', ';
-       };
-       $domv->($max_mass,   $sail_total[$i]{mass},   'kg');
-       $domv->($max_volume, $sail_total[$i]{volume}, 'l');
-       $totals .= ".\n";
-     }
-     $show_total_now->($totals);
-}
-</%perl>
-<tbody><tr>
-<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"
- %></strong>
-</table>
-<& query_age:dataages, id2age => \%da_ages &>
-%
-% } # ========== TRADING PLAN ==========
+% } # !printable
 
 <%init>
 use CommodsWeb;