X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-live.git;a=blobdiff_plain;f=yarrg%2Fweb%2Froutetrade;h=59a856631b5a1cfdc042664a3d7c67815453c61f;hp=383d55481b93bc34bf24f06bf58e19730722bc56;hb=a0835ba69f333931705bf31f39b82339e7c5b16a;hpb=97d26c012a638833535a5e1c98d287101b220887;ds=sidebyside

diff --git a/yarrg/web/routetrade b/yarrg/web/routetrade
index 383d554..59a8566 100644
--- a/yarrg/web/routetrade
+++ b/yarrg/web/routetrade
@@ -38,25 +38,22 @@ $dbh
 @islandids
 @archipelagoes
 $qa
-$max_mass
-$max_volume
-$lossperleaguepct
-$max_capital
+$routeparams
 </%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 $now= time;
 
-my %flow_conds;
+my @flow_conds;
 my @query_params;
 my %dists;
+my $expected_total_profit;
 
 my $sd_condition= sub {
 	my ($bs, $ix) = @_;
@@ -82,30 +79,33 @@ my @subflows;
 foreach my $org_i (0..$#islandids) {
 	my $org_isle= $islandids[$org_i];
 	my $org_cond= $sd_condition->('sell',$org_i);
-	my %dst_conds;
+	my @dst_conds;
 	foreach my $dst_i ($org_i..$#islandids) {
 		my $dst_isle= $islandids[$dst_i];
 		# Don't ever consider sailing things round the houses:
-		next if grep { $dst_isle == $_ } @islandids[$org_i..$dst_i-1];
-		next if grep { $org_isle == $_ } @islandids[$org_i+1..$dst_i];
-		my $dst_cond= $sd_condition->('buy',$dst_i);
+		next if defined $dst_isle and
+			grep { $dst_isle == $_ } @islandids[$org_i..$dst_i-1];
+		next if defined $org_isle and
+			grep { $org_isle == $_ } @islandids[$org_i+1..$dst_i];
+		my $dst_cond;
 		if ($dst_i==$org_i and !defined $org_isle) {
 			# we always want arbitrage, but mentioning an arch
 			# once shouldn't produce intra-arch trades
-			$dst_cond=
-				"($dst_cond AND sell.islandid = buy.islandid)";
+			$dst_cond= "sell.islandid = buy.islandid";
+		} else {
+			$dst_cond= $sd_condition->('buy',$dst_i);
 		}
-		$dst_conds{$dst_cond}= 1;
+		push @dst_conds, $dst_cond;
 
 		if ($specific) {
 			push @{ $ipair2subflowinfs{$org_isle,$dst_isle} },
 				[ $org_i, $dst_i ];
 		}
 	}
-	$flow_conds{ "$org_cond AND (
+	push @flow_conds, "$org_cond AND (
 			".join("
-		     OR ", sort keys %dst_conds)."
-		)" }= 1;
+		     OR ",@dst_conds)."
+		)";
 }
 
 my $stmt= "		
@@ -140,6 +140,9 @@ my $stmt= "
 		commods.commodid				commodid,
 		commods.unitmass				unitmass,
 		commods.unitvolume				unitvolume,
+		commods.ordval					ordval,
+		commods.posinclass				posinclass,
+		commods.commodclassid				commodclassid,
 		dist						dist,
 		buy.price - sell.price				unitprofit
 	FROM commods
@@ -154,7 +157,7 @@ my $stmt= "
 	JOIN dists ON aiid = sell.islandid AND biid = buy.islandid
 	WHERE	(
 		".join("
-	   OR	", sort keys %flow_conds)."
+	   OR	", @flow_conds)."
 	)
 	  AND	buy.price > sell.price
 	ORDER BY org_name, dst_name, commodname, unitprofit DESC,
@@ -261,6 +264,15 @@ foreach my $v (qw(MaxMass MaxVolume)) {
 <& dumptable:end, qa => $qa &>
 % }
 
+% 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>.
+%	}
+% }
+
 <%perl>
 
 my @sail_total;
@@ -283,18 +295,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%%",
@@ -372,8 +372,23 @@ foreach my $f (@flows) {
 	if (defined $qa->{"R$f->{UidShort}"} &&
 	    !defined $qa->{"T$f->{UidShort}"}) {
 		$f->{Suppress}= 1;
+	} else {
+		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>
 
@@ -408,19 +423,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"},
 		);
@@ -461,7 +469,8 @@ foreach my $ci (0..($#islandids-1)) {
 	}
 
 	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 .= "
@@ -473,9 +482,9 @@ 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'}       });
 	$cplex.= "\n";
 }
 
@@ -520,6 +529,9 @@ if ($qa->{'debug'}) {
 			$found_section= 1;
 			next;
 		}
+		if (m/^Objective:\s+totalprofit = (\d+(?:\.\d*)?) /) {
+			$expected_total_profit= $1;
+		}
 		next unless $found_section==1;
 		if (!length $continuation) {
 			next if !$continuation &&  m/^[- ]+$/;
@@ -537,9 +549,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+)$/) {
+			([+-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 }
@@ -558,6 +570,7 @@ 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 ?";
 };
 
 $addcols->({ DoReverse => 1, TotalSubflows => 1, Special => sub {
@@ -578,120 +591,32 @@ $addcols->({ Total => 0, DoReverse => 1, TotalSubflows => 1 }, qw(
 
 % } # ========== OPTIMISATION ==========
 
-% my %ts_sortkeys;
-% {
-%	my $cdspan= $qa->{ShowStalls} ? ' colspan=2' : '';
-%	my $cdstall= $qa->{ShowStalls} ? '<th>Stall</th>' : '';
-<table id="trades" rules=groups>
-<colgroup span=1>
-<colgroup span=2>
-<% $qa->{ShowStalls} ? '<colgroup span=2>' : '' %>
-<colgroup span=1>
-<colgroup span=2>
-<colgroup span=2>
-<colgroup span=2>
-<colgroup span=3>
-<colgroup span=3>
-%	if ($optimise) {
-<colgroup span=3>
-%	}
-<tr class="spong">
-<th>
-<th<% $cdspan %>>Collect
-<th<% $cdspan %>>Deliver
-<th>
-<th colspan=2>Collect
-<th colspan=2>Deliver
-<th colspan=2>Profit
-<th colspan=3>Max
-<th colspan=1>
-<th colspan=2>Max
-%	if ($optimise) {
-<th colspan=3>Planned
-%	}
-
-<tr>
-<th>
-<th>Island <% $cdstall %>
-<th>Island <% $cdstall %>
-<th>Commodity
-<th>Price
-<th>Qty
-<th>Price
-<th>Qty
-<th>Margin
-<th>Unit
-<th>Qty
-<th>Capital
-<th>Profit
-<th>Dist
-<th>Mass
-<th>Vol
-%	if ($optimise) {
-<th>Qty
-<th>Capital
-<th>Profit
-%	}
-% }
-
-<tr id="trades_sort">
-% foreach my $col (@cols) {
-<th>
-% }
-
-% foreach my $flowix (0..$#flows) {
-%	my $flow= $flows[$flowix];
-%	my $rowid= "id_row_$flow->{UidShort}";
-<tr id="<% $rowid %>" class="datarow<% $flowix & 1 %>">
-<td><input type=hidden   name=R<% $flow->{UidShort} %> value="">
-    <input type=checkbox name=T<% $flow->{UidShort} %> value=""
-       <% $flow->{Suppress} ? '' : 'checked' %> >
-%	my $ci= 1;
-%	while ($ci < @cols) {
-%		my $col= $cols[$ci];
-%		my $spec= {
-%			Span => 1,
-%			Align => ($col->{Text} ? '' : 'align=right')
-%		};
-%		my $cn= $col->{Name};
-%		my $v;
-%		if (!$col->{TotalSubflows}) {
-%			$v= $flow->{$cn};
-%		} else {
-%			$v= 0;
-%			$v += $_->{$cn} foreach @{ $flow->{Subflows} };
-%		}
-%		if ($col->{Special}) { $col->{Special}($flow,$col,$v,$spec); }
-%		$col->{Total} += $v
-%			if defined $col->{Total} and not $flow->{Suppress};
-%		$v='' if !$col->{Text} && !$v;
-%		my $sortkey= $col->{SortColKey} ?
-%			$flow->{$col->{SortColKey}} : $v;
-%		$ts_sortkeys{$ci}{$rowid}= $sortkey;
-<td <% $spec->{Span} ? "colspan=$spec->{Span}" : ''
- %> <% $spec->{Align}
- %>><% exists $spec->{String} ? $spec->{String} : $v |h %>
-%		$ci += $spec->{Span};
-%	}
+% if (!printable($m)) {
+<h2>Contents</h2>
+<ul>
+% if ($optimise) {
+ <li><a href="#plan">Voyage trading plan</a>
+  <ul>
+   <li><a href="#summary">Summary statistics</a>
+   <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>
 % }
-<tr id="trades_total">
-<th>
-<th colspan=2>Total
-% foreach my $ci (3..$#cols) {
-%	my $col= $cols[$ci];
-<td align=right>
-%	if (defined $col->{Total}) {
-<% $col->{Total} |h %>
-%	}
+ <li><a href="#dataage">Data age summary</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>.
 % }
-</table>
-
-<&| tabsort, cols => \@cols, table => 'trades', rowclass => 'datarow',
-	throw => 'trades_sort', tbrow => 'trades_total' &>
-  ts_sortkeys= <% to_json_protecttags(\%ts_sortkeys) %>;
-</&tabsort>
-
-<input type=submit name=update value="Update">
 
 % if ($optimise) { # ========== TRADING PLAN ==========
 %
@@ -701,18 +626,30 @@ $addcols->({ Total => 0, DoReverse => 1, TotalSubflows => 1 }, qw(
 % my $total_total= 0;
 % my $total_dist= 0;
 %
-<h1>Voyage trading plan</h1>
-<table rules=groups>
+<h2><a name="plan">Voyage trading plan</a></h2>
+
+<table class="data" rules=groups <% printable($m) ? 'width=100%' : '' %> >
+% my $tbody= sub {
+%	if (!printable($m)) { return '<tbody>'; }
+%#  return "<tr><td colspan=7><hr>";
+%	my ($c)= qw(40 00)[$_[0]];
+%	return "<tr><td bgcolor=\"#${c}${c}${c}\" height=1 colspan=7>";
+% };
+%
 % foreach my $i (0..$#islandids) {
-<tbody>
-<tr><td colspan=4>
+<% $tbody->(1) %>
+<tr>
 %	$iquery->execute($islandids[$i]);
 %	my ($islandname) = $iquery->fetchrow_array();
 %	if (!$i) {
+<td colspan=2>
 <strong>Start at <% $islandname |h %></strong>
+<td colspan=2><a href="docs#posinclass">[what are these codes?]</a>
+<td>
 %	} else {
 %		my $this_dist= $distance->($islandids[$i-1],$islandids[$i]);
 %		$total_dist += $this_dist;
+<td colspan=5>
 <%perl>
 		my $total_value= 0;
 		foreach my $sf (@subflows) {
@@ -729,12 +666,11 @@ $addcols->({ Total => 0, DoReverse => 1, TotalSubflows => 1 }, qw(
 <%perl>
      my $age_reported= 0;
      my %flowlists;
-     #print "<tr><td colspan=6>" if $qa->{'debug'};
+     #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 if $f->{Suppress};
 		next unless $sf->{ucfirst $od} == $i;
 		#print " FLOW $f->{Ix} SUB #$sf->{Org}..$sf->{Dst} "
 		#	if $qa->{'debug'};
@@ -744,6 +680,7 @@ $addcols->({ Total => 0, DoReverse => 1, TotalSubflows => 1 }, qw(
 		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)),
@@ -755,6 +692,33 @@ $addcols->({ Total => 0, DoReverse => 1, TotalSubflows => 1 }, qw(
 			dstArbitrage => 0,
 		} unless $$todo;
 		$$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"};
@@ -786,7 +750,7 @@ $addcols->({ Total => 0, DoReverse => 1, TotalSubflows => 1 }, qw(
 </%perl>
 <tr>
 <td colspan=1>
-<td colspan=2><% $xinfo %>
+<td colspan=3><% $xinfo %>
 <td colspan=2 align=right><% $totaldesc %>
 <td align=right><% $totalwas |h %> total
 <%perl>
@@ -809,14 +773,15 @@ $addcols->({ Total => 0, DoReverse => 1, TotalSubflows => 1 }, qw(
 (Data age: <span id="<% $cellid %>"><% prettyprint_age($age) %></span>)
 %		} elsif (!defined $total) {
 %			$total= 0;
-<tbody>
+<% $tbody->(0) %>
 %		}
 %		$total += $t->{Total};
 %		my $span= 0 + keys %{ $t->{Stalls} };
 %		my $td= "td rowspan=$span";
-<tr class="datarow<% $dline %>">
+% tr_datarow($m,$dline);
 <<% $td %>><% $collectdeliver %>
 <<% $td %>><% $t->{'commodname'} |h %>
+<<% $td %>><% $t->{'posinclass'} %>
 %
 %		my @stalls= sort keys %{ $t->{Stalls} };
 %		my $pstall= sub {
@@ -830,7 +795,7 @@ $addcols->({ Total => 0, DoReverse => 1, TotalSubflows => 1 }, qw(
 <<% $td %> align=right><% $t->{Total} |h %> total
 %
 %		foreach my $stallix (1..$#stalls) {
-<tr class="datarow<% $dline %>">
+% tr_datarow($m,$dline);
 %			$pstall->($stallix);
 %		}
 %
@@ -855,24 +820,192 @@ $addcols->({ Total => 0, DoReverse => 1, TotalSubflows => 1 }, qw(
 		$totals .= sprintf "%g %s", ($max-$got), $units;
 		$delim= ', ';
 	};
-	$domv->($max_mass,   $sail_total[$i]{mass},   'kg');
-	$domv->($max_volume, $sail_total[$i]{volume}, 'l');
+	$domv->($routeparams->{MaxMass},   $sail_total[$i]{mass},   'kg');
+	$domv->($routeparams->{MaxVolume}, $sail_total[$i]{volume}, 'l');
 	$totals .= ".\n";
      }
      $show_total_now->($totals);
 }
-</%perl>
-<tbody><tr>
-<td colspan=2>Total distance: <% $total_dist %> leagues.
+</%perl><a name="summary"></a>
+<% $tbody->(1) %><tr>
+<td colspan=3>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 &>
+Expected average profit:
+ approx. <strong><% sprintf "%d", $expected_total_profit %></strong> poe
+ (considering expected losses, but ignoring rum consumed)
 %
 % } # ========== TRADING PLAN ==========
 
+% if (!printable($m)) {
+<h2><a name="dataage">Data age summary</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>' : '';
+<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>' : '' %>
+<colgroup span=1>
+<colgroup span=2>
+<colgroup span=2>
+<colgroup span=2>
+<colgroup span=3>
+<colgroup span=3>
+%	if ($optimise) {
+<colgroup span=3>
+%	}
+<tr>
+<th>
+<th<% $cdspan %>>Collect
+<th<% $cdspan %>>Deliver
+<th>
+<th colspan=2>Collect
+<th colspan=2>Deliver
+<th colspan=2>Profit
+<th colspan=3>Max
+<th colspan=1>
+<th colspan=2>Max
+%	if ($optimise) {
+<th colspan=3>Planned
+%	}
+
+<tr>
+<th>
+<th>Island <% $cdstall %>
+<th>Island <% $cdstall %>
+<th>Commodity
+<th>Price
+<th>Qty
+<th>Price
+<th>Qty
+<th>Margin
+<th>Unit
+<th>Qty
+<th>Capital
+<th>Profit
+<th>Dist
+<th>Mass
+<th>Vol
+%	if ($optimise) {
+<th>Qty
+<th>Capital
+<th>Profit
+%	}
+%   }
+
+<tr id="trades_sort">
+%   foreach my $col (@cols) {
+<th>
+%   }
+
+%   foreach my $flowix (0..$#flows) {
+%	my $flow= $flows[$flowix];
+%	my $rowid= "id_row_$flow->{UidShort}";
+<tr id="<% $rowid %>" class="datarow<% $flowix & 1 %>">
+<td><input type=hidden   name=R<% $flow->{UidShort} %> value="">
+    <input type=checkbox name=T<% $flow->{UidShort} %> value=""
+       <% $flow->{Suppress} ? '' : 'checked' %> >
+%	my $ci= 1;
+%	while ($ci < @cols) {
+%		my $col= $cols[$ci];
+%		my $spec= {
+%			Span => 1,
+%			Align => ($col->{Text} ? '' : 'align=right')
+%		};
+%		my $cn= $col->{Name};
+%		my $v;
+%		if (!$col->{TotalSubflows}) {
+%			$v= $flow->{$cn};
+%		} else {
+%			$v= 0;
+%			$v += $_->{$cn} foreach @{ $flow->{Subflows} };
+%		}
+%		if ($col->{Special}) { $col->{Special}($flow,$col,$v,$spec); }
+%		$col->{Total} += $v
+%			if defined $col->{Total} and not $flow->{Suppress};
+%		$v='' if !$col->{Text} && !$v;
+%		my $sortkey= $col->{SortColKey} ?
+%			$flow->{$col->{SortColKey}} : $v;
+%		$ts_sortkeys{$ci}{$rowid}= $sortkey;
+<td <% $spec->{Span} ? "colspan=$spec->{Span}" : ''
+ %> <% $spec->{Align}
+ %>><% exists $spec->{String} ? $spec->{String} : $v |h %>
+%		$ci += $spec->{Span};
+%	}
+%   }
+<tr id="trades_total">
+<th>
+<th colspan=2>Total
+%   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">
+
+% } # !printable
+
 <%init>
 use CommodsWeb;
 use Commods;