X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-live.git;a=blobdiff_plain;f=yarrg%2Fweb%2Froutetrade;h=97359a9fc1fea4920f7a6deaad345d775a34d036;hp=597f9eea3f7fc937a921e6056348064e1a041d66;hb=cfb91181c6dec6df662af8325c0293d4c2e8be25;hpb=5c74b3871323fe2d06d5fcbdcd6c248a88a9ca00 diff --git a/yarrg/web/routetrade b/yarrg/web/routetrade index 597f9ee..97359a9 100644 --- a/yarrg/web/routetrade +++ b/yarrg/web/routetrade @@ -32,6 +32,42 @@ This Mason component is the core trade planner for a specific route. +========== TODO ========== +16:36 alpha,byrne,papaya,turtle,jorvik,luthien is my example + +16:37 if tehre are 2 rows which take the same object and sell it for the + same profit at two other islands, choose the shortest route as the + preferred one +16:37 coconut buy 10 sell 16, at luthien or jorvik, in that example +16:38 Do you see what I mean? + +16:38 I don't know how hard this is, but can you show only the suggested + trades to start ith and have a button to show all? +16:39 Also, maybe colour to highlight the suggested trades? + +16:40 columns should be sortable with the small arrows as before + +16:51 YPP interfaces have price then qty. You have qty then price. This + is confusing! +16:51 the max column ordering is OK +16:51 (alo profit and suggested are OK) +16:52 Err, you want qty on the left in those two but on the right in + collect and deliver ? +16:53 Yes (price and capital are not the same thing) +16:53 OK +16:53 for max the order in which you want to think about it is 'I need to + buy ten of them and that will cost me $total price) +16:54 s/)/'/ + +16:46 Also trading plan not functional but I guess you know that :-) + +Also: +- potential cost of losses +- max volume/mass +- use POST for update. Hrrm. + +========== TODO ========== + <%args> $dbh @@ -142,16 +178,31 @@ my $sth= $dbh->prepare($stmt); $sth->execute(@query_params); my @flows; -my @columns; +my @cols; + +my $addcols= sub { + my $base= shift @_; + foreach my $name (@_) { + push @cols, { Name => $name, %$base }; + } +}; + 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->({}, + qw( org_qty org_price dst_qty dst_price + Margin unitprofit MaxQty + MaxCapital MaxProfit + )); @@ -176,7 +227,7 @@ push @columns, qw(commodname $f->{MaxProfit}= $f->{MaxQty} * $f->{'unitprofit'}; $f->{MaxCapital}= $f->{MaxQty} * $f->{'org_price'}; - $f->{PctProfit}= sprintf "%3.1f%%", + $f->{Margin}= sprintf "%3.1f%%", $f->{'dst_price'} * 100.0 / $f->{'org_price'} - 100.0; $f->{"org_stallid"}= $f->{"dst_stallid"}= 'all' @@ -186,10 +237,69 @@ push @columns, qw(commodname 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->{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 (defined $qa->{"R$f->{UidShort}"} && + !defined $qa->{"T$f->{UidShort}"}) { + $f->{Suppress}= 1; } - $f->{Uid}= join '_', @uid; push @flows, $f; @@ -223,13 +333,19 @@ 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 '_', ( 'avail', @@ -300,9 +416,12 @@ if ($qa->{'debug'}) { die unless $found_section; }; -print join ' ', map { $_->{Optimal} } @flows; - -push @columns, qw(OptQty OptCapital OptProfit); +$addcols->({}, qw( + OptQty + )); +$addcols->({ Total => 0 }, qw( + OptCapital OptProfit + )); @@ -311,8 +430,20 @@ push @columns, qw(OptQty OptCapital OptProfit); % { % my $cdspan= $qa->{ShowStalls} ? ' colspan=2' : ''; % my $cdstall= $qa->{ShowStalls} ? 'Stall' : ''; - +
+++<% $qa->{ShowStalls} ? '' : '' %> ++++++% if ($optimise) { ++% } + + -% foreach my $col (@columns) { - +
>Collect >Deliver @@ -325,15 +456,16 @@ push @columns, qw(OptQty OptCapital OptProfit); % }
Island <% $cdstall %> Island <% $cdstall %> Commodity -Price Qty Price Qty -Unit +Price Margin +Unit Qty Capital Profit @@ -346,11 +478,65 @@ push @columns, qw(OptQty OptCapital OptProfit); % foreach my $flow (@flows) {
<% $flow->{$col} |h %> +{UidShort} %> value=""> + {UidShort} %> value="" + <% $flow->{Suppress} ? '' : 'checked' %> > +% foreach my $ci (0..$#cols) { +% my $col= $cols[$ci]; +% my $v= $flow->{$col->{Name}}; +% $col->{Total} += $v if defined $col->{Total}; +% $v='' if !$col->{Text} && !$v; +{Text} ? '' : 'align=right' %>><% $v |h %> +% } +% } +
+Total +% foreach my $ci (2..$#cols) { +% my $col= $cols[$ci]; + +% if (defined $col->{Total}) { +<% $col->{Total} |h %> +% } +% } +
+ + + +% if ($optimise) { # ========== TRADING PLAN ========== +% +% my $iquery= $dbh->prepare('SELECT islandname FROM islands +% WHERE islandid = ?'); +% +

Voyage trading plan

+ +% foreach my $i (0..$#islandids) { +Buy or sell flow % } +% } % }
+% $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}; +
+% +% } # ========== TRADING PLAN ========== <%init> use CommodsWeb;