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=59b02674f1034bb82c983f803afa44e54600075b;hp=b198b9b3867ab7cff6ca4fb2150f2b33d037c921;hb=59393edc418d7062f6fb074a90d3b8e810c43772;hpb=9f2bf0795621de264cea63060079704dfd9d5a0b

diff --git a/yarrg/web/routetrade b/yarrg/web/routetrade
index b198b9b..59b0267 100644
--- a/yarrg/web/routetrade
+++ b/yarrg/web/routetrade
@@ -39,6 +39,8 @@ $dbh
 @archipelagoes
 $qa
 $routeparams
+$reset_suppressions
+$quri
 </%args>
 <& query_age:pageload &>
 
@@ -47,6 +49,9 @@ $routeparams
 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;
 
@@ -140,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
@@ -272,13 +281,21 @@ Searched for arbitrage trades only, in <% $archipelagoes[0] |h %>
 
 <%perl>
 
-my @sail_total;
-
 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'}
@@ -303,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,
@@ -365,11 +384,21 @@ 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= {
@@ -389,13 +418,24 @@ foreach my $f (@flows) {
 }
 </%perl>
 
-% my $optimise= $specific;
-% if (!$optimise) {
+% my $optimise= 1;
 
-<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 ==========
@@ -407,11 +447,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 .= "
 
@@ -482,6 +528,32 @@ foreach my $ci (0..($#islandids-1)) {
 	$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";
 }
 
@@ -512,7 +584,7 @@ if ($qa->{'debug'}) {
 	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
+		qw(glpsol --tmlim 5 --memlim 5 --intopt --cuts --bfs
 		          --cpxlp /dev/stdin -o /dev/stdout));
 	print "<pre>\n" if $qa->{'debug'};
 	my $found_section= 0;
@@ -635,14 +707,18 @@ Generated by YARRG at <strong><%
 %
 % foreach my $i (0..$#islandids) {
 <% $tbody->(1) %>
-<tr><td colspan=4>
+<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) {
@@ -659,7 +735,7 @@ Generated by YARRG at <strong><%
 <%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) {
@@ -673,6 +749,7 @@ Generated by YARRG at <strong><%
 		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)),
@@ -683,7 +760,35 @@ Generated by YARRG at <strong><%
 			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"};
@@ -715,7 +820,7 @@ Generated by YARRG at <strong><%
 </%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>
@@ -743,9 +848,14 @@ Generated by YARRG at <strong><%
 %		$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'};
 % tr_datarow($m,$dline);
 <<% $td %>><% $collectdeliver %>
-<<% $td %>><% $t->{'commodname'} |h %>
+<<% $td %>><a href="<% $quri->(%linkqf) %>"><% $t->{'commodname'} |h %></a>
+<<% $td %>><% $t->{'posinclass'} %>
 %
 %		my @stalls= sort keys %{ $t->{Stalls} };
 %		my $pstall= sub {
@@ -792,7 +902,7 @@ Generated by YARRG at <strong><%
 }
 </%perl><a name="summary"></a>
 <% $tbody->(1) %><tr>
-<td colspan=2>Total distance: <% $total_dist %> leagues.
+<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"