X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2Fweb%2Froutetrade;h=9e9256a72529cdb83088032a16a9d5ff1fca7409;hb=refs%2Ftags%2F6.4;hp=c6ed408d80fe9d779e54de724856c6abf02ab673;hpb=fdf4e5538945f9d058f3ad54ddfe707b0977e1d4;p=ypp-sc-tools.web-test.git
diff --git a/yarrg/web/routetrade b/yarrg/web/routetrade
index c6ed408..9e9256a 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= 25;
+
+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
@@ -261,15 +270,32 @@ foreach my $v (qw(MaxMass MaxVolume)) {
<& dumptable:end, qa => $qa &>
% }
-<%perl>
+% if (@islandids==1) {
+% if (defined $islandids[0]) {
+Searched for arbitrage trades only.
+% } else {
+Searched for arbitrage trades only, in <% $archipelagoes[0] |h %>
+[?].
+% }
+% }
-my @sail_total;
+<%perl>
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'}
@@ -283,22 +309,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%%",
@@ -310,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,
@@ -372,22 +384,58 @@ 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= {
+ 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>
-% my $optimise= $specific;
-% if (!$optimise) {
+% my $optimise= 1;
-
% 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) {
+
+
Therefore, optimal voyage trade plan not calculated.
% } else { # ========== OPTMISATION ==========
@@ -399,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 .= "
@@ -412,13 +466,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,
@@ -480,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(< $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";
}
@@ -510,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 "\n" if $qa->{'debug'};
my $found_section= 0;
@@ -524,7 +598,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;
@@ -544,8 +618,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;
@@ -565,6 +639,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 {
@@ -585,17 +660,32 @@ $addcols->({ Total => 0, DoReverse => 1, TotalSubflows => 1 }, qw(
% } # ========== OPTIMISATION ==========
+% if (!printable($m)) {
Contents
+% } else {
+% my @tl= gmtime $now or die $!;
+
+Generated by YARRG at <%
+ sprintf "%04d-%02d-%02d %02d:%02d:%02d UTC",
+ $tl[5]+1900, @tl[4,3,2,1,0]
+ |h %>.
+% }
% if ($optimise) { # ========== TRADING PLAN ==========
%
@@ -607,17 +697,28 @@ $addcols->({ Total => 0, DoReverse => 1, TotalSubflows => 1 }, qw(
%
-
+ >
+% my $tbody= sub {
+% if (!printable($m)) { return ''; }
+%# return " ";
+% my ($c)= qw(40 00)[$_[0]];
+% return " |
";
+% };
+%
% foreach my $i (0..$#islandids) {
- |
-
+<% $tbody->(1) %>
+ |
% $iquery->execute($islandids[$i]);
% my ($islandname) = $iquery->fetchrow_array();
% if (!$i) {
+
Start at <% $islandname |h %>
+ | [what are these codes?]
+ |
% } else {
% my $this_dist= $distance->($islandids[$i-1],$islandids[$i]);
% $total_dist += $this_dist;
+ |
<%perl>
my $total_value= 0;
foreach my $sf (@subflows) {
@@ -634,12 +735,11 @@ $addcols->({ Total => 0, DoReverse => 1, TotalSubflows => 1 }, qw(
<%perl>
my $age_reported= 0;
my %flowlists;
- #print " |
" if $qa->{'debug'};
+ #print " |
" 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'};
@@ -649,6 +749,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)),
@@ -659,7 +760,35 @@ $addcols->({ Total => 0, DoReverse => 1, TotalSubflows => 1 }, qw(
orgArbitrage => 0,
dstArbitrage => 0,
} unless $$todo;
+ $$todo->{'commodid'}= $f->{'commodid'};
$$todo->{'commodname'}= $f->{'commodname'};
+ $$todo->{'posinclass'}= '';
+ my $incl= $f->{'posinclass'};
+
+ my $findclass= $dbh->prepare(<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]." ";
+ }
+ }
+ $$todo->{'posinclass'}=
+ " "
+ .$abbrev." ";
+ }
$$todo->{'stallname'}= $stallname;
$$todo->{Price}= $price;
$$todo->{Timestamp}= $f->{"${od}_timestamp"};
@@ -691,7 +820,7 @@ $addcols->({ Total => 0, DoReverse => 1, TotalSubflows => 1 }, qw(
%perl>
- | <% $xinfo %>
+ | <% $xinfo %>
| <% $totaldesc %>
| <% $totalwas |h %> total
<%perl>
@@ -714,14 +843,19 @@ $addcols->({ Total => 0, DoReverse => 1, TotalSubflows => 1 }, qw(
(Data age: <% prettyprint_age($age) %>)
% } elsif (!defined $total) {
% $total= 0;
- |
+<% $tbody->(0) %>
% }
% $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 %>><% $t->{'commodname'} |h %>
+<<% $td %>><% $t->{'posinclass'} %>
%
% my @stalls= sort keys %{ $t->{Stalls} };
% my $pstall= sub {
@@ -735,7 +869,7 @@ $addcols->({ Total => 0, DoReverse => 1, TotalSubflows => 1 }, qw(
<<% $td %> align=right><% $t->{Total} |h %> total
%
% foreach my $stallix (1..$#stalls) {
-
+% tr_datarow($m,$dline);
% $pstall->($stallix);
% }
%
@@ -767,8 +901,8 @@ $addcols->({ Total => 0, DoReverse => 1, TotalSubflows => 1 }, qw(
$show_total_now->($totals);
}
%perl>
-
-Total distance: <% $total_dist %> leagues.
+<% $tbody->(1) %> |
+Total distance: <% $total_dist %> leagues.
| Overall net cash flow
| <%
$total_total < 0 ? -$total_total." loss" : $total_total." gain"
@@ -781,7 +915,7 @@ Expected average profit:
%
% } # ========== TRADING PLAN ==========
-% {
+% if (!printable($m)) {
<%perl>
my $sth_i= $dbh->prepare(<
&>
% }
-% my %ts_sortkeys;
-% {
+% if (!printable($m)) {
+% my %ts_sortkeys;
+% {
% my $cdspan= $qa->{ShowStalls} ? ' colspan=2' : '';
% my $cdstall= $qa->{ShowStalls} ? 'Stall | ' : '';
- | |