X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.main.git;a=blobdiff_plain;f=yarrg%2Fweb%2Froutetrade;h=27cf295d19376abb8451f7dbba43f972a7aab100;hp=61484391130a9341b3b90d099c4b2889f27d0619;hb=5d7aa1e2df29f74f0fbaa8dcb21fa1f7921f30a8;hpb=ce49620ef8a4e24daa206185138919bb58d35d37

diff --git a/yarrg/web/routetrade b/yarrg/web/routetrade
index 6148439..27cf295 100644
--- a/yarrg/web/routetrade
+++ b/yarrg/web/routetrade
@@ -40,9 +40,7 @@ $dbh
 $qa
 $routeparams
 </%args>
-<&| script &>
-  da_pageload= Date.now();
-</&script>
+<& query_age:pageload &>
 
 <%perl>
 
@@ -142,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
@@ -263,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;
@@ -285,22 +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_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;
-	}
-
 	$f->{MarginSortKey}= sprintf "%d",
 		$f->{'dst_price'} * 10000 / $f->{'org_price'};
 	$f->{Margin}= sprintf "%3.1f%%",
@@ -378,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>
 
@@ -414,13 +423,7 @@ 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 '_', (
 			$od,
@@ -526,7 +529,7 @@ if ($qa->{'debug'}) {
 			$found_section= 1;
 			next;
 		}
-		if (m/^Objective:\s+totalprofit = (\d+\.\d*) /) {
+		if (m/^Objective:\s+totalprofit = (\d+(?:\.\d*)?) /) {
 			$expected_total_profit= $1;
 		}
 		next unless $found_section==1;
@@ -546,8 +549,8 @@ if ($qa->{'debug'}) {
 		my ($varname, $qty) = m/^
 			\s* \d+ \s+
 			(\w+) \s+ (?: [A-Z*]+ \s+ )?
-			([0-9.]+) \s
-			/x or die "$_ ?";
+			([+-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;
@@ -567,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 {
@@ -587,16 +591,32 @@ $addcols->({ Total => 0, DoReverse => 1, TotalSubflows => 1 }, qw(
 
 % } # ========== OPTIMISATION ==========
 
+% 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>
 % }
+ <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>.
+% }
 
 % if ($optimise) { # ========== TRADING PLAN ==========
 %
@@ -608,10 +628,17 @@ $addcols->({ Total => 0, DoReverse => 1, TotalSubflows => 1 }, qw(
 %
 <h2><a name="plan">Voyage trading plan</a></h2>
 
-<table rules=groups>
+<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><td colspan=5>
 %	$iquery->execute($islandids[$i]);
 %	my ($islandname) = $iquery->fetchrow_array();
 %	if (!$i) {
@@ -635,12 +662,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'};
@@ -650,6 +676,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)),
@@ -661,6 +688,20 @@ $addcols->({ Total => 0, DoReverse => 1, TotalSubflows => 1 }, qw(
 			dstArbitrage => 0,
 		} unless $$todo;
 		$$todo->{'commodname'}= $f->{'commodname'};
+		$$todo->{'posinclass'}= '';
+		if ($f->{'posinclass'}) {
+			my $findclass= $dbh->prepare(<<END);
+SELECT commodclass, maxposinclass FROM commodclasses WHERE commodclassid = ?
+END
+			$findclass->execute($f->{'commodclassid'});
+			my $classinfo= $findclass->fetchrow_hashref();
+			$$todo->{'posinclass'}=
+				sprintf "(%s %d/%d)",
+				$classinfo->{'commodclass'},
+				$f->{'posinclass'},
+				$classinfo->{'maxposinclass'}
+					if $classinfo->{'maxposinclass'} > 9;
+		}
 		$$todo->{'stallname'}= $stallname;
 		$$todo->{Price}= $price;
 		$$todo->{Timestamp}= $f->{"${od}_timestamp"};
@@ -692,7 +733,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>
@@ -715,14 +756,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'} |h %>
 %
 %		my @stalls= sort keys %{ $t->{Stalls} };
 %		my $pstall= sub {
@@ -736,7 +778,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);
 %		}
 %
@@ -768,8 +810,8 @@ $addcols->({ Total => 0, DoReverse => 1, TotalSubflows => 1 }, qw(
      $show_total_now->($totals);
 }
 </%perl><a name="summary"></a>
-<tbody><tr>
-<td colspan=2>Total distance: <% $total_dist %> leagues.
+<% $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"
@@ -782,12 +824,59 @@ Expected average profit:
 %
 % } # ========== TRADING PLAN ==========
 
-% my %ts_sortkeys;
-% {
+% 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 id="trades" rules=groups>
+<table class="data" id="trades" rules=groups>
 <colgroup span=1>
 <colgroup span=2>
 <% $qa->{ShowStalls} ? '<colgroup span=2>' : '' %>
@@ -837,14 +926,14 @@ Expected average profit:
 <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 %>">
@@ -878,26 +967,28 @@ Expected average profit:
  %>><% 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">
 
+% } # !printable
+
 <%init>
 use CommodsWeb;
 use Commods;