X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2Fweb%2Froutetrade;h=03ef3e1e8dc4ab99bfc8b29cfc8b69750268845c;hb=1a23128c88e708c60a40a7248539bb7f29a16190;hp=08bad334569ea32178ec8e6e7d3345bf4d8060e5;hpb=e48954272cc534a0e90a95ecfa68feb36bcd542b;p=ypp-sc-tools.main.git diff --git a/yarrg/web/routetrade b/yarrg/web/routetrade index 08bad33..03ef3e1 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; @@ -143,6 +148,7 @@ my $stmt= " commods.ordval ordval, commods.posinclass posinclass, commods.commodclassid commodclassid, + commods.flags flags, dist dist, buy.price - sell.price unitprofit FROM commods @@ -275,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'} @@ -306,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, @@ -368,11 +384,21 @@ foreach my $f (@flows) { $f->{UidLong} eq $recons_long or die "$f->{UidLong} = $f->{UidShort} = $recons_long ?"; } +} + +foreach my $f (@flows) { - if (defined $qa->{"R$f->{UidShort}"} && - !defined $qa->{"T$f->{UidShort}"}) { - $f->{Suppress}= 1; + 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= { @@ -392,13 +418,25 @@ foreach my $f (@flows) { } %perl> -% my $optimise= $specific; -% if (!$optimise) { +% my $optimise= 1; +% my $opt_how; -
% 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 ==========
@@ -410,11 +448,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 .= "
@@ -462,7 +506,7 @@ foreach my $ci (0..($#islandids-1)) {
}
#print " RELEVANT $ci COUNT ".scalar(@rel_subflows)." ";
if (!@rel_subflows) {
- foreach my $mv (qw(mass volume)) {
+ foreach my $mv (qw(mass volume capital)) {
$sail_total[$ci]{$mv}= 0;
}
next;
@@ -485,6 +529,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(<
+
+\n" if $qa->{'debug'};
+ qw(glpsol --tmlim 5 --memlim 20), @opts,
+ qw( --cpxlp /dev/stdin -o /dev/stdout));
+ if ($qa->{'debug'}) {
+ print "
@opts
\n\n";
+ }
+ $expected_total_profit= undef;
+ $_->{OptQty}= undef foreach @subflows;
my $found_section= 0;
my $glpsol_out= '';
my $continuation='';
+ my $timelimit= 0;
+ my $somemip= 0;
while (<$output>) {
$glpsol_out.= $_;
print encode_entities($_) if $qa->{'debug'};
@@ -529,6 +606,14 @@ if ($qa->{'debug'}) {
$found_section= 1;
next;
}
+ if ((m/^Integer optimization begins/ .. 0) &&
+ m/^\+ \s* \d+\: \s* mip \s* = \s* \d/) {
+ $somemip= 1;
+ next;
+ }
+ if (m/^TIME LIMIT EXCEEDED/) {
+ $timelimit= 1;
+ }
if (m/^Objective:\s+totalprofit = (\d+(?:\.\d*)?) /) {
$expected_total_profit= $1;
}
@@ -549,7 +634,7 @@ if ($qa->{'debug'}) {
my ($varname, $qty) = m/^
\s* \d+ \s+
(\w+) \s+ (?: [A-Z*]+ \s+ )?
- ([+-e0-9.]+) \s
+ ([-+0-9]+)(?: [.e][-+e0-9.]* )? \s
/x or die "$cplex \n==\n $glpsol_out $_ ?";
if ($varname =~ m/^f(\d+)s(\d+)_/) {
my ($ix,$orgix) = ($1,$2);
@@ -561,7 +646,7 @@ if ($qa->{'debug'}) {
$sf->{OptQty}= $qty;
$sf->{OptProfit}= $qty * $flow->{'unitprofit'};
$sf->{OptCapital}= $qty * $flow->{'org_price'};
- } elsif ($varname =~ m/^(mass|volume)_(\d+)$/) {
+ } elsif ($varname =~ m/^(mass|volume|capital)_(\d+)$/) {
my ($mv,$ix) = ($1,$2);
$sail_total[$ix]{$mv}= $qty;
}
@@ -571,8 +656,28 @@ if ($qa->{'debug'}) {
pipethrough_run_finish($output,$prerr);
map { defined $_->{OptQty} or die "$prerr $_->{Flow}{Ix}" } @subflows;
defined $expected_total_profit or die "$prerr ?";
+ return 0 unless $somemip || !$timelimit;
+ $opt_how= $how;
+ return 1;
};
+unless ($try_solve->('Optimisation successful',
+ qw( --intopt --cuts --bfs )) or
+ $try_solve->('Complex problem, downgraded'.
+ ' to rounded-down LP.',
+ qw( --nomip ))) {
+%perl>
+
Optimisation failed
+The linear/mixed-integer optimisation failed.
+Please report this problem.
+
+
+<% $cplex |h %>
+
+<%perl>
+ return;
+}
+
$addcols->({ DoReverse => 1, TotalSubflows => 1, Special => sub {
my ($flow,$col,$v,$spec) = @_;
if ($flow->{ExpectedUnitProfit} < 0) {
@@ -595,9 +700,9 @@ $addcols->({ Total => 0, DoReverse => 1, TotalSubflows => 1 }, qw(
Contents
% if ($optimise) {
+
% } else {
@@ -619,51 +724,57 @@ Generated by YARRG at <%
% }
% if ($optimise) { # ========== TRADING PLAN ==========
-%
-% my $iquery= $dbh->prepare('SELECT islandname FROM islands
-% WHERE islandid = ?');
-% my %da_ages;
-% my $total_total= 0;
-% my $total_dist= 0;
-%
-
-
% }
- Voyage trading plan
+<%perl>
+my $iquery= $dbh->prepare('SELECT islandname FROM islands
+ WHERE islandid = ?');
+my %da_ages;
+my $total_total= 0;
+my $total_dist= 0;
+my @oldest= (-1, 'nowhere');
+my $plan_html= '';
+
+my $plan_table_info= printable($m) ? 'width=100%' : '';
+$plan_html .= < >
-% my $tbody= sub {
-% if (!printable($m)) { return ''; }
-%# return "
+END
+
+%perl>
+% if (!printable($m)) {
+
";
-% 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) {
- '; }
+ my ($c)= qw(40 00)[$_[0]];
+ return "
-Start at <% $islandname |h %>
- [?]
+my $tbody= sub {
+ if (!printable($m)) { return ' ";
+};
+
+foreach my $i (0..$#islandids) {
+ $plan_html .= $tbody->(1);
+ $plan_html .= " \n";
+ $iquery->execute($islandids[$i]);
+ my ($islandnamepr)= encode_entities( $iquery->fetchrow_array() );
+
+ if (!$i) {
+ $plan_html .= < [what are these codes?]
+
+END
+ } else {
+ my $this_dist= $distance->($islandids[$i-1],$islandids[$i]);
+ $total_dist += $this_dist;
+ $plan_html .= <
-% }
-<%perl>
+END
+ }
my $age_reported= 0;
my %flowlists;
#print "" if $qa->{'debug'};
@@ -691,27 +802,34 @@ Generated by YARRG at <%
orgArbitrage => 0,
dstArbitrage => 0,
} unless $$todo;
+ $$todo->{'commodid'}= $f->{'commodid'};
$$todo->{'commodname'}= $f->{'commodname'};
$$todo->{'posinclass'}= '';
- if ($f->{'posinclass'}) {
- my $findclass= $dbh->prepare(<
- <% $xinfo %>
- <% $totaldesc %>
- <% $totalwas |h %> total
-<%perl>
+ $xinfo
+ $totaldesc
+ $totalwas total
+END
$total_to_show= undef;
};
-%perl>
-% my $show_flows= sub {
-% my ($od,$arbitrage,$collectdeliver) = @_;
-% my $todo= $flowlists{$od};
-% return unless $todo;
-% foreach my $tkey (sort keys %$todo) {
-% my $t= $todo->{$tkey};
-% next if $t->{"${od}Arbitrage"} != $arbitrage;
-% $show_total_now->('');
-% if (!$age_reported++) {
-% my $age= $now - $t->{Timestamp};
-% my $cellid= "da_${i}";
-% $da_ages{$cellid}= $age;
- \
-(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";
-% tr_datarow($m,$dline);
-<<% $td %>><% $collectdeliver %>
-<<% $td %>><% $t->{'commodname'} |h %>
-<<% $td %>><% $t->{'posinclass'} %>
-%
-% my @stalls= sort keys %{ $t->{Stalls} };
-% my $pstall= sub {
-% my $name= $stalls[$_[0]];
- <% $name |h %>
-% };
-%
-% $pstall->(0);
-<<% $td %> align=right><% $t->{Price} |h %> poe ea.
-<<% $td %> align=right><% $t->{Qty} |h %> unit(s)
-<<% $td %> align=right><% $t->{Total} |h %> total
-%
-% foreach my $stallix (1..$#stalls) {
-% tr_datarow($m,$dline);
-% $pstall->($stallix);
-% }
-%
-% $dline ^= 1;
-% }
-% };
-<%perl>
+ my $show_flows= sub {
+ my ($od,$arbitrage,$collectdeliver) = @_;
+ my $todo= $flowlists{$od};
+ return unless $todo;
+ foreach my $tkey (sort keys %$todo) {
+ my $t= $todo->{$tkey};
+ next if $t->{"${od}Arbitrage"} != $arbitrage;
+ $show_total_now->('');
+ if (!$age_reported++) {
+ my $age= $now - $t->{Timestamp};
+ @oldest= ($age,$islandnamepr) if $oldest[0] < $age;
+ my $cellid= "da_${i}";
+ my $agepr= prettyprint_age($age);
+ $da_ages{$cellid}= $age;
+ $plan_html .= <
- Total distance: <% $total_dist %> leagues.
+
+my $cashflowpr= $total_total < 0
+ ? -$total_total." loss"
+ : $total_total." gain";
+
+my $max_capital= 0;
+foreach my $cap (map { $_->{capital} } @sail_total) {
+ $max_capital= $cap if $cap > $max_capital;
+}
+
+$da_ages{'oldest'}= $oldest[0];
+
+$plan_html .= $tbody->(1) . < Total distance: $total_dist leagues.
Overall net cash flow
- <%
- $total_total < 0 ? -$total_total." loss" : $total_total." gain"
- %>
+ $cashflowpr
Summary
+% }
+
+
+
+
+ Distance:
+ <% $total_dist %> leagues,
+ <% scalar(@islandids) %> island(s)
+
+ Planned net cash flow:
+ <% $cashflowpr %>
+
+ Expected profit on average: approx.
+
+ <% sprintf "%d", $expected_total_profit %> poe
+ (considering expected losses, but ignoring rum consumed)
+
+ Capital required:
+
+ <% $max_capital %> poe or less
+
+ Oldest market data used:
+ <% prettyprint_age($oldest[0]) %>
+ (<% $oldest[1] %>)
+
+ <% $opt_how %>
+ Voyage trading plan
+<% $plan_html %>
<& query_age:dataages, id2age => \%da_ages &>
-Expected average profit:
- approx. <% sprintf "%d", $expected_total_profit %> poe
- (considering expected losses, but ignoring rum consumed)
%
% } # ========== TRADING PLAN ==========
% if (!printable($m)) {
-Data age summary
+Relevant data ages
<%perl>
my $sth_i= $dbh->prepare(<