X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2Fweb%2Froutetrade;h=831a1b1a26a2d46f051ec4265f8089cb13fbf7da;hb=27941f861802c5de63b470bf87bd60c1a077bc3a;hp=4885782e58a440b7a773510a049daf363e5e0838;hpb=38888dbd9221f97b1886ee545d0113c88432556a;p=ypp-sc-tools.db-test.git

diff --git a/yarrg/web/routetrade b/yarrg/web/routetrade
index 4885782..831a1b1 100644
--- a/yarrg/web/routetrade
+++ b/yarrg/web/routetrade
@@ -38,15 +38,24 @@ $dbh
 @islandids
 @archipelagoes
 $qa
+$max_mass
+$max_volume
+$lossperleaguepct
 </%args>
 <&| script &>
   da_pageload= Date.now();
 </&script>
 
+% if (defined $max_mass || defined $max_volume) {
+<strong>WARNING - VESSEL CAPACITY LIMIT NOT YET IMPLEMENTED</strong>
+<p>
+% }
+
 <%perl>
 
+my $loss_per_league= defined $lossperleaguepct ? $lossperleaguepct*0.01 : 1e-7;
+
 my $now= time;
-my $loss_per_league= 1e-7;
 
 my @flow_conds;
 my @query_params;
@@ -205,9 +214,12 @@ $addcols->({ DoReverse => 1, SortColKey => 'MarginSortKey' },
 	qw(	Margin
 	));
 $addcols->({ DoReverse => 1 },
-	qw(	unitprofit dist MaxQty
-		MaxCapital MaxProfit
+	qw(	unitprofit MaxQty MaxCapital MaxProfit dist
 	));
+foreach my $v (qw(MaxMass MaxVolume)) {
+   $addcols->({
+	DoReverse => 1, Total => 0, SortColKey => "${v}SortKey" }, $v);
+}
 
 </%perl>
 
@@ -269,6 +281,12 @@ foreach my $f (@flows) {
 	$f->{MaxProfit}= $f->{MaxQty} * $f->{'unitprofit'};
 	$f->{MaxCapital}= $f->{MaxQty} * $f->{'org_price'};
 
+	$f->{MaxMassSortKey}= $f->{MaxQty} * $f->{'unitmass'};
+	$f->{MaxVolumeSortKey}= $f->{MaxQty} * $f->{'unitvolume'};
+	foreach my $v (qw(Mass Volume)) {
+		$f->{"Max$v"}= sprintf "%.1f", $f->{"Max${v}SortKey"} * 1e-6;
+	}
+
 	$f->{MarginSortKey}= sprintf "%d",
 		$f->{'dst_price'} * 10000 / $f->{'org_price'};
 	$f->{Margin}= sprintf "%3.1f%%",
@@ -356,7 +374,7 @@ die "$cmpu $uue ?" if length $cmpu > 20;
 
 <p>
 % if (@islandids<=1) {
-Route is trivial.
+Route contains only one location.
 % }
 % if (!$specific) {
 Route contains archipelago(es), not just specific islands.
@@ -374,9 +392,9 @@ my $cplex= "
 Maximize
 
   totalprofit:
-                  ".(join " +
+                  ".(join "
                   ", map {
-			sprintf "%.20f %s", $_->{ExpectedUnitProfit}, $_->{Var}
+			sprintf "%+.20f %s", $_->{ExpectedUnitProfit}, $_->{Var}
 			} @flows)."
 
 Subject To
@@ -463,7 +481,14 @@ if ($qa->{'debug'}) {
 	die $prerr unless $found_section;
 };
 
-$addcols->({ DoReverse => 1 }, qw(
+$addcols->({ DoReverse => 1, Special => sub {
+	my ($flow,$col,$v,$spec) = @_;
+	if ($flow->{ExpectedUnitProfit} < 0) {
+		$spec->{Span}= 3;
+		$spec->{String}= '(Small margin)';
+		$spec->{Align}= 'align=center';
+	}
+} }, qw(
 		OptQty
 	));
 $addcols->({ Total => 0, DoReverse => 1 }, qw(
@@ -486,7 +511,7 @@ $addcols->({ Total => 0, DoReverse => 1 }, qw(
 <colgroup span=2>
 <colgroup span=2>
 <colgroup span=2>
-<colgroup span=1>
+<colgroup span=3>
 <colgroup span=3>
 %	if ($optimise) {
 <colgroup span=3>
@@ -499,8 +524,9 @@ $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
+<th colspan=1>
+<th colspan=2>Max
 %	if ($optimise) {
 <th colspan=3>Planned
 %	}
@@ -516,10 +542,12 @@ $addcols->({ Total => 0, DoReverse => 1 }, qw(
 <th>Qty
 <th>Margin
 <th>Unit
-<th>Dist
 <th>Qty
 <th>Capital
 <th>Profit
+<th>Dist
+<th>Mass
+<th>Vol
 %	if ($optimise) {
 <th>Qty
 <th>Capital
@@ -539,15 +567,25 @@ $addcols->({ Total => 0, DoReverse => 1 }, qw(
 <td><input type=hidden   name=R<% $flow->{UidShort} %> value="">
     <input type=checkbox name=T<% $flow->{UidShort} %> value=""
        <% $flow->{Suppress} ? '' : 'checked' %> >
-%	foreach my $ci (1..$#cols) {
+%	my $ci= 1;
+%	while ($ci < @cols) {
 %		my $col= $cols[$ci];
+%		my $spec= {
+%			Span => 1,
+%			Align => ($col->{Text} ? '' : 'align=right')
+%		};
 %		my $v= $flow->{$col->{Name}};
-%		$col->{Total} += $v if defined $col->{Total};
+%		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 <% $col->{Text} ? '' : 'align=right' %>><% $v |h %>
+<td <% $spec->{Span} ? "colspan=$spec->{Span}" : ''
+ %> <% $spec->{Align}
+ %>><% exists $spec->{String} ? $spec->{String} : $v |h %>
+%		$ci += $spec->{Span};
 %	}
 % }
 <tr id="trades_total">
@@ -584,11 +622,11 @@ $addcols->({ Total => 0, DoReverse => 1 }, qw(
 <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) {
 <strong>Start at <% $islandname |h %></strong>
 %	} else {
+%		my $this_dist= $distance->($islandids[$i-1],$islandids[$i]);
+%		$total_dist += $this_dist;
 <strong>Sail to <% $islandname |h %></strong>
 - <% $this_dist |h %> leagues </td>
 %	}