X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-test.git;a=blobdiff_plain;f=yarrg%2Fweb%2Froutetrade;h=831a1b1a26a2d46f051ec4265f8089cb13fbf7da;hp=9fde77e7aa6783104b92fd80d636a0c0c45a970d;hb=d3f18f5c06089a54b57e8c94483ce48d82975c45;hpb=34203ee3033aeaa10eff8848ad869f5eeb1c789a

diff --git a/yarrg/web/routetrade b/yarrg/web/routetrade
index 9fde77e..831a1b1 100644
--- a/yarrg/web/routetrade
+++ b/yarrg/web/routetrade
@@ -38,18 +38,28 @@ $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;
+my %dists;
 
 my $sd_condition= sub {
 	my ($bs, $ix) = @_;
@@ -85,10 +95,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 +171,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,9 +214,12 @@ $addcols->({ DoReverse => 1, SortColKey => 'MarginSortKey' },
 	qw(	Margin
 	));
 $addcols->({ DoReverse => 1 },
-	qw(	unitprofit 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>
 
@@ -252,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%%",
@@ -261,6 +296,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,
@@ -337,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.
@@ -355,9 +392,9 @@ my $cplex= "
 Maximize
 
   totalprofit:
-                  ".(join " +
+                  ".(join "
                   ", map {
-			sprintf "%.20f %s", $_->{ExpectedUnitProfit}, $_->{Var}
+			sprintf "%+.20f %s", $_->{ExpectedUnitProfit}, $_->{Var}
 			} @flows)."
 
 Subject To
@@ -444,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(
@@ -468,6 +512,7 @@ $addcols->({ Total => 0, DoReverse => 1 }, qw(
 <colgroup span=2>
 <colgroup span=2>
 <colgroup span=3>
+<colgroup span=3>
 %	if ($optimise) {
 <colgroup span=3>
 %	}
@@ -480,6 +525,8 @@ $addcols->({ Total => 0, DoReverse => 1 }, qw(
 <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
 %	}
@@ -498,6 +545,9 @@ $addcols->({ Total => 0, DoReverse => 1 }, qw(
 <th>Qty
 <th>Capital
 <th>Profit
+<th>Dist
+<th>Mass
+<th>Vol
 %	if ($optimise) {
 <th>Qty
 <th>Capital
@@ -517,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">
@@ -540,15 +600,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 +613,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();
 %	if (!$i) {
-Start at <% $islandname |h %>
+<strong>Start at <% $islandname |h %></strong>
 %	} else {
-Sail to <% $islandname |h %>
+%		my $this_dist= $distance->($islandids[$i-1],$islandids[$i]);
+%		$total_dist += $this_dist;
+<strong>Sail to <% $islandname |h %></strong>
+- <% $this_dist |h %> leagues </td>
 %	}
-</strong>
 <%perl>
      my $age_reported= 0;
      my %flowlists;
@@ -580,6 +638,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 +663,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 +736,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"