X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.web-live.git;a=blobdiff_plain;f=yarrg%2Fweb%2Froutetrade;h=6bc7277d341a69049358dbb40176700657674187;hp=9c2a5a423fdda83fe833c43ceb2ba02462df6a79;hb=f41b94c1ec31bbff084b7429c1aec495aca2ab1e;hpb=b54e4d479114f7641bddf8a47d075639323620d2
diff --git a/yarrg/web/routetrade b/yarrg/web/routetrade
index 9c2a5a4..6bc7277 100644
--- a/yarrg/web/routetrade
+++ b/yarrg/web/routetrade
@@ -98,30 +98,43 @@ my $stmt= "
SELECT sell_islands.islandname org_name,
sell_islands.islandid org_id,
sell.price org_price,
- sum(sell.qty) org_qty,
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_stalls.stallname dst_stallname,
+ buy.qty dst_qty,
+" : "
+ sum(sell.qty) org_qty,
sum(buy.qty) dst_qty,
+")."
commods.commodname commodname,
commods.commodid commodid,
commods.unitmass unitmass,
commods.unitvolume unitvolume,
- buy.price - sell.price unitprofit,
- min(sell.qty,buy.qty) max_qty,
- min(sell.qty,buy.qty) * (buy.price-sell.price) max_profit
+ 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
+" : "")."
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, max_profit DESC, commodname,
+")."
+ ORDER BY org_name, dst_name, commodname, unitprofit DESC,
org_price, dst_price DESC
";
@@ -129,9 +142,31 @@ my $sth= $dbh->prepare($stmt);
$sth->execute(@query_params);
my @flows;
-my @columns= qw(org_name dst_name commodname
- org_price org_qty dst_price dst_qty
- max_qty max_profit);
+my @cols;
+
+my $addcols= sub {
+ my $base= shift @_;
+ foreach my $name (@_) {
+ push @cols, { Name => $name, %$base };
+ }
+};
+
+if ($qa->{ShowStalls}) {
+ $addcols->({ Text => 1 }, qw(
+ org_name org_stallname
+ dst_name dst_stallname
+ ));
+} else {
+ $addcols->({Text => 1 }, qw(
+ org_name dst_name
+ ));
+}
+$addcols->({ Text => 1 }, qw(commodname));
+$addcols->({},
+ qw( org_qty org_price dst_qty dst_price
+ Margin unitprofit MaxQty
+ MaxCapital MaxProfit
+ ));
@@ -142,19 +177,103 @@ my @columns= qw(org_name dst_name commodname
% }
+<& dumptable:start, qa => $qa, sth => $sth &>
% {
-<& dumptable:start, sth => $sth &>
-% my $flow;
-% while ($flow= $sth->fetchrow_hashref()) {
-% $flow->{Ix}= @flows;
-% $flow->{Var}= "f$flow->{Ix}";
-% push @flows, $flow;
-<& dumptable:row, sth => $sth, row => $flow &>
+% my $f;
+% while ($f= $sth->fetchrow_hashref()) {
+<%perl>
+
+ $f->{Ix}= @flows;
+ $f->{Var}= "f$f->{Ix}";
+
+ $f->{MaxQty}= $f->{'org_qty'} < $f->{'dst_qty'}
+ ? $f->{'org_qty'} : $f->{'dst_qty'};
+ $f->{MaxProfit}= $f->{MaxQty} * $f->{'unitprofit'};
+ $f->{MaxCapital}= $f->{MaxQty} * $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};
+
+ my @uid= $f->{commodid};
+ foreach my $od (qw(org dst)) {
+ push @uid,
+ $f->{"${od}_id"},
+ $f->{"${od}_price"};
+ push @uid,
+ $f->{"${od}_stallid"}
+ if $qa->{ShowStalls};
+ }
+ $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;
+
+#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 ?";
+ }
+
+ if ($qa->{"R$f->{UidShort}"} && !$qa->{"T$f->{UidShort}"}) {
+ $f->{Suppress}= 1;
+ }
+
+ push @flows, $f;
+
+
+<& dumptable:row, qa => $qa, sth => $sth, row => $f &>
% }
-<& dumptable:end &>
+<& dumptable:end, qa => $qa &>
% }
-% if (!$specific || $confusing || @islandids<=1) {
+% my $optimise= $specific && !$confusing && @islandids>1;
+% if (!$optimise) {
% if (@islandids<=1) {
@@ -177,20 +296,29 @@ Maximize
totalprofit:
".(join " +
- ", map { "$_->{unit_profit} $_->{Var}" } @flows)."
+ ", map { "$_->{unitprofit} $_->{Var}" } @flows)."
Subject To
";
my %avail_csts;
foreach my $flow (@flows) {
+ if ($flow->{Suppress}) {
+ $cplex .= "
+ $flow->{Var} = 0
+";
+ next;
+ }
foreach my $od (qw(org dst)) {
- my $cstname= join '_',
+ my $cstname= join '_', (
'avail',
$flow->{'commodid'},
$od,
$flow->{"${od}_id"},
- $flow->{"${od}_price"};
+ $flow->{"${od}_price"},
+ $flow->{"${od}_stallid"},
+ );
+
push @{ $avail_csts{$cstname}{Flows} }, $flow->{Var};
$avail_csts{$cstname}{Qty}= $flow->{"${od}_qty"};
}
@@ -242,24 +370,137 @@ if ($qa->{'debug'}) {
my ($ix, $qty) =
m/^\s*\d+\s+f(\d+)\s+\S+\s+(\d+)\s/ or die "$_ ?";
my $flow= $flows[$ix] or die;
- $flow->{Opt_qty}= $qty;
- $flow->{Opt_profit}= $flow->{'unitprofit'} * $qty;
+ $flow->{OptQty}= $qty;
+ $flow->{OptProfit}= $flow->{'unitprofit'} * $qty;
+ $flow->{OptCapital}= $flow->{OptQty} * $flow->{'org_price'};
}
print "\n" if $qa->{'debug'};
pipethrough_run_finish($output, 'glpsol');
die unless $found_section;
};
-print join ' ', map { $_->{Optimal} } @flows;
-
-push @columns, qw(Opt_qty Opt_profit);
+$addcols->({}, qw(
+ OptQty
+ ));
+$addcols->({ Total => 0 }, qw(
+ OptCapital OptProfit
+ ));
-<& dumptable:literal, cols => \@columns, rows => \@flows &>
-
% } # ========== OPTIMISATION ==========
+% {
+% my $cdspan= $qa->{ShowStalls} ? ' colspan=2' : '';
+% my $cdstall= $qa->{ShowStalls} ? '
Stall | ' : '';
+
+
+
+
+% if ($optimise) { # ========== TRADING PLAN ==========
+%
+% my $iquery= $dbh->prepare('SELECT islandname FROM islands
+% WHERE islandid = ?');
+%
+Voyage trading plan
+
+% foreach my $i (0..$#islandids) {
+|
+% $iquery->execute($islandids[$i]);
+% my ($islandname) = $iquery->fetchrow_array();
+% if (!$i) {
+Start at <% $islandname |h %>
+% } else {
+Sail to <% $islandname |h %>
+% }
+
+% foreach my $od (qw(dst org)) {
+% my $sign= $od eq 'dst' ? -1 : +1;
+% foreach my $f (sort {
+% $a->{'commodname'} cmp $b->{'commodname'}
+% or $sign * ($a->{"${od}_price"} <=> $b->{"${od}_price"})
+% or $a->{"${od}_stallname"} cmp $b->{"${od}_stallname"}
+% } @flows) {
+% next if $f->{Suppress};
+% next unless $f->{"${od}_id"} == $islandids[$i];
+% next unless $f->{OptQty};
+ |
Buy or sell flow
+% }
+% }
+% }
+
+%
+% } # ========== TRADING PLAN ==========
+
<%init>
use CommodsWeb;
use Commods;