X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2Fweb%2Froutetrade;h=4885782e58a440b7a773510a049daf363e5e0838;hb=cf9d0277c5d6bfe900a0881a00984f8268a90514;hp=dcf3671620f32b8680c7375b6d714e911442ed0d;hpb=4311ae355f0a94637c94d1d02a6edcbe65bebaa7;p=ypp-sc-tools.db-live.git
diff --git a/yarrg/web/routetrade b/yarrg/web/routetrade
index dcf3671..4885782 100644
--- a/yarrg/web/routetrade
+++ b/yarrg/web/routetrade
@@ -39,10 +39,18 @@ $dbh
@archipelagoes
$qa
%args>
+<&| script &>
+ da_pageload= Date.now();
+&script>
+
<%perl>
+my $now= time;
+my $loss_per_league= 1e-7;
+
my @flow_conds;
my @query_params;
+my %dists;
my $sd_condition= sub {
my ($bs, $ix) = @_;
@@ -78,10 +86,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 ];
@@ -98,60 +108,106 @@ my $stmt= "
SELECT sell_islands.islandname org_name,
sell_islands.islandid org_id,
sell.price org_price,
+ sell.qty org_qty_stall,
+ sell_stalls.stallname org_stallname,
+ sell.stallid org_stallid,
+ sell_uploads.timestamp org_timestamp,
buy_islands.islandname dst_name,
buy_islands.islandid dst_id,
buy.price dst_price,
-".($qa->{ShowStalls} ? "
- sell.stallid org_stallid,
- sell_stalls.stallname org_stallname,
- sell.qty org_qty,
- buy.stallid dst_stallid,
+ buy.qty dst_qty_stall,
buy_stalls.stallname dst_stallname,
- buy.qty dst_qty,
+ buy.stallid dst_stallid,
+ buy_uploads.timestamp dst_timestamp,
+".($qa->{ShowStalls} ? "
+ sell.qty org_qty_agg,
+ buy.qty dst_qty_agg,
" : "
- sum(sell.qty) org_qty,
- sum(buy.qty) dst_qty,
+ (SELECT sum(qty) FROM sell AS sell_agg
+ WHERE sell_agg.commodid = commods.commodid
+ AND sell_agg.islandid = sell.islandid
+ AND sell_agg.price = sell.price) org_qty_agg,
+ (SELECT sum(qty) FROM buy AS buy_agg
+ WHERE buy_agg.commodid = commods.commodid
+ AND buy_agg.islandid = buy.islandid
+ AND buy_agg.price = buy.price) dst_qty_agg,
")."
commods.commodname commodname,
commods.commodid commodid,
commods.unitmass unitmass,
commods.unitvolume unitvolume,
+ dist dist,
buy.price - sell.price unitprofit
FROM commods
- JOIN buy on commods.commodid = buy.commodid
- JOIN sell on commods.commodid = sell.commodid
- JOIN islands as sell_islands on sell.islandid = sell_islands.islandid
- JOIN islands as buy_islands on buy.islandid = buy_islands.islandid
-".($qa->{ShowStalls} ? "
- JOIN stalls as sell_stalls on sell.stallid = sell_stalls.stallid
- JOIN stalls as buy_stalls on buy.stallid = buy_stalls.stallid
-" : "")."
+ JOIN sell ON commods.commodid = sell.commodid
+ JOIN buy ON commods.commodid = buy.commodid
+ JOIN islands AS sell_islands ON sell.islandid = sell_islands.islandid
+ JOIN islands AS buy_islands ON buy.islandid = buy_islands.islandid
+ JOIN uploads AS sell_uploads ON sell.islandid = sell_uploads.islandid
+ JOIN uploads AS buy_uploads ON buy.islandid = buy_uploads.islandid
+ JOIN stalls AS sell_stalls ON sell.stallid = sell_stalls.stallid
+ JOIN stalls AS buy_stalls ON buy.stallid = buy_stalls.stallid
+ JOIN dists ON aiid = sell.islandid AND biid = buy.islandid
WHERE (
".join("
OR ", @flow_conds)."
)
AND buy.price > sell.price
-".($qa->{ShowStalls} ? "" : "
- GROUP BY commods.commodid, org_id, org_price, dst_id, dst_price
-")."
ORDER BY org_name, dst_name, commodname, unitprofit DESC,
- org_price, dst_price DESC
+ org_price, dst_price DESC,
+ org_stallname, dst_stallname
";
my $sth= $dbh->prepare($stmt);
$sth->execute(@query_params);
my @flows;
-my @columns;
+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 {
+ my $base= shift @_;
+ foreach my $name (@_) {
+ my $col= { Name => $name, %$base };
+ $col->{Numeric}=1 if !$col->{Text};
+ push @cols, $col;
+ }
+};
+
if ($qa->{ShowStalls}) {
- push @columns, qw(org_name org_stallname dst_name dst_stallname);
+ $addcols->({ Text => 1 }, qw(
+ org_name org_stallname
+ dst_name dst_stallname
+ ));
} else {
- push @columns, qw(org_name dst_name);
+ $addcols->({Text => 1 }, qw(
+ org_name dst_name
+ ));
}
-push @columns, qw(commodname
- org_price org_qty dst_price dst_qty
- unitprofit PctProfit
- MaxQty MaxCapital MaxProfit);
+$addcols->({ Text => 1 }, qw(commodname));
+$addcols->({ DoReverse => 1 },
+ qw( org_price org_qty_agg dst_price dst_qty_agg
+ ));
+$addcols->({ DoReverse => 1, SortColKey => 'MarginSortKey' },
+ qw( Margin
+ ));
+$addcols->({ DoReverse => 1 },
+ qw( unitprofit dist MaxQty
+ MaxCapital MaxProfit
+ ));
%perl>
@@ -164,45 +220,136 @@ push @columns, qw(commodname
<& dumptable:start, qa => $qa, sth => $sth &>
% {
-% my $f;
-% while ($f= $sth->fetchrow_hashref()) {
+% my $got;
+% while ($got= $sth->fetchrow_hashref()) {
<%perl>
- $f->{Ix}= @flows;
- $f->{Var}= "f$f->{Ix}";
+ my $f= $flows[$#flows];
+ if ( !$f ||
+ $qa->{ShowStalls} ||
+ grep { $f->{$_} ne $got->{$_} }
+ qw(org_id org_price dst_id dst_price commodid)
+ ) {
+ # Make a new flow rather than adding to the existing one
+
+ $f= {
+ Ix => scalar(@flows),
+ Var => "f".@flows,
+ %$got
+ };
+ $f->{"org_stallid"}= $f->{"dst_stallid"}= 'all'
+ if !$qa->{ShowStalls};
+ push @flows, $f;
+ }
+ foreach my $od (qw(org dst)) {
+ $f->{"${od}Stalls"}{
+ $got->{"${od}_stallname"}
+ } =
+ $got->{"${od}_qty_stall"}
+ ;
+ }
+
+%perl>
+<& dumptable:row, qa => $qa, sth => $sth, row => $f &>
+% }
+<& dumptable:end, qa => $qa &>
+% }
+
+<%perl>
+
+if (!@flows) {
+ print 'No profitable trading opportunities were found.';
+ return;
+}
- $f->{MaxQty}= $f->{'org_qty'} < $f->{'dst_qty'}
- ? $f->{'org_qty'} : $f->{'dst_qty'};
+foreach my $f (@flows) {
+
+ $f->{MaxQty}= $f->{'org_qty_agg'} < $f->{'dst_qty_agg'}
+ ? $f->{'org_qty_agg'} : $f->{'dst_qty_agg'};
$f->{MaxProfit}= $f->{MaxQty} * $f->{'unitprofit'};
$f->{MaxCapital}= $f->{MaxQty} * $f->{'org_price'};
- $f->{PctProfit}= sprintf "%3.1f%%",
+ $f->{MarginSortKey}= sprintf "%d",
+ $f->{'dst_price'} * 10000 / $f->{'org_price'};
+ $f->{Margin}= sprintf "%3.1f%%",
$f->{'dst_price'} * 100.0 / $f->{'org_price'} - 100.0;
- $f->{"org_stallid"}= $f->{"dst_stallid"}= 'all'
- if !$qa->{ShowStalls};
+ $f->{ExpectedUnitProfit}=
+ $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,
$f->{"${od}_id"},
- $f->{"${od}_price"},
- $f->{"${od}_stallid"};
+ $f->{"${od}_price"};
+ push @uid,
+ $f->{"${od}_stallid"}
+ if $qa->{ShowStalls};
}
- $f->{Uid}= join '_', @uid;
+ $f->{UidLong}= join '_', @uid;
+
+ my $base= 31;
+ my $cmpu= '';
+ map {
+ my $uue= $_;
+ my $first= $base;
+ do {
+ my $this= $uue % $base;
+print STDERR "uue=$uue this=$this ";
+ $uue -= $this;
+ $uue /= $base;
+ $this += $first;
+ $first= 0;
+ $cmpu .= chr($this + ($this < 26 ? ord('a') :
+ $this < 52 ? ord('A')-26
+ : ord('0')-52));
+print STDERR " uue=$uue this=$this cmpu=$cmpu\n";
+die "$cmpu $uue ?" if length $cmpu > 20;
+ } while ($uue);
+ $cmpu;
+ } @uid;
+ $f->{UidShort}= $cmpu;
+
+ if ($qa->{'debug'}) {
+ my @outuid;
+ $_= $f->{UidShort};
+ my $mul;
+ while (m/./) {
+ my $v= m/^[a-z]/ ? ord($&)-ord('a') :
+ m/^[A-Z]/ ? ord($&)-ord('A')+26 :
+ m/^[0-9]/ ? ord($&)-ord('0')+52 :
+ die "$_ ?";
+ if ($v >= $base) {
+ push @outuid, 0;
+ $v -= $base;
+ $mul= 1;
+#print STDERR "(next)\n";
+ }
+ die "$f->{UidShort} $_ ?" unless defined $mul;
+ $outuid[$#outuid] += $v * $mul;
- if ($qa->{"rtsela_$f->{Uid}"} &&
- !$qa->{"rtselg_$f->{Uid}"}) {
- $f->{Suppress}= 1;
+#print STDERR "$f->{UidShort} $_ $& v=$v mul=$mul ord()=".ord($&).
+# "[vs.".ord('a').",".ord('A').",".ord('0')."]".
+# " outuid=@outuid\n";
+
+ $mul *= $base;
+ s/^.//;
+ }
+ my $recons_long= join '_', @outuid;
+ $f->{UidLong} eq $recons_long or
+ die "$f->{UidLong} = $f->{UidShort} = $recons_long ?";
}
- push @flows, $f;
+ if (defined $qa->{"R$f->{UidShort}"} &&
+ !defined $qa->{"T$f->{UidShort}"}) {
+ $f->{Suppress}= 1;
+ }
+}
%perl>
-<& dumptable:row, qa => $qa, sth => $sth, row => $f &>
-% }
-<& dumptable:end, qa => $qa &>
-% }
% my $optimise= $specific && !$confusing && @islandids>1;
% if (!$optimise) {
@@ -218,7 +365,7 @@ Route contains archipelago(es), not just specific islands.
Route is complex - it visits the same island several times
and isn't a simple loop.
% }
-Therefore, optimal trade pattern not calculated.
+Therefore, optimal voyage trade plan not calculated.
% } else { # ========== OPTMISATION ==========
<%perl>
@@ -228,7 +375,9 @@ Maximize
totalprofit:
".(join " +
- ", map { "$_->{unit_profit} $_->{Var}" } @flows)."
+ ", map {
+ sprintf "%.20f %s", $_->{ExpectedUnitProfit}, $_->{Var}
+ } @flows)."
Subject To
";
@@ -252,7 +401,7 @@ foreach my $flow (@flows) {
);
push @{ $avail_csts{$cstname}{Flows} }, $flow->{Var};
- $avail_csts{$cstname}{Qty}= $flow->{"${od}_qty"};
+ $avail_csts{$cstname}{Qty}= $flow->{"${od}_qty_agg"};
}
}
foreach my $cstname (sort keys %avail_csts) {
@@ -286,7 +435,9 @@ if ($qa->{'debug'}) {
qw(glpsol --cpxlp /dev/stdin -o /dev/stdout));
print "
\n" if $qa->{'debug'};
my $found_section= 0;
+ my $glpsol_out= '';
while (<$output>) {
+ $glpsol_out.= $_;
print encode_entities($_) if $qa->{'debug'};
if (m/^\s*No\.\s+Column name\s+St\s+Activity\s/) {
die if $found_section>0;
@@ -307,23 +458,40 @@ if ($qa->{'debug'}) {
$flow->{OptCapital}= $flow->{OptQty} * $flow->{'org_price'};
}
print "