X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-test.git;a=blobdiff_plain;f=yarrg%2Fweb%2Froutetrade;h=ce319facae713bb9e32edddf86a1509d979b4772;hp=d90bf40fb7afe7993c0f0924e4ea38c2e6dc2ba0;hb=efd685a5df610ffefc545a41be67e2e0d4b69c7c;hpb=e60403dc74a9bbb3732ddb8bcdc2d264e9f13f23 diff --git a/yarrg/web/routetrade b/yarrg/web/routetrade index d90bf40..ce319fa 100644 --- a/yarrg/web/routetrade +++ b/yarrg/web/routetrade @@ -38,18 +38,14 @@ $dbh @islandids @archipelagoes $qa -$max_mass -$max_volume -$lossperleaguepct -$max_capital +$routeparams -<&| script &> - da_pageload= Date.now(); - +<& query_age:pageload &> <%perl> -my $loss_per_league= defined $lossperleaguepct ? $lossperleaguepct*0.01 : 1e-7; +my $loss_per_league= defined $routeparams->{LossPerLeaguePct} + ? $routeparams->{LossPerLeaguePct}*0.01 : 1e-7; my $loss_per_delay_slot= 1e-8; my $now= time; @@ -57,6 +53,7 @@ my $now= time; my @flow_conds; my @query_params; my %dists; +my $expected_total_profit; my $sd_condition= sub { my ($bs, $ix) = @_; @@ -264,6 +261,15 @@ foreach my $v (qw(MaxMass MaxVolume)) { <& dumptable:end, qa => $qa &> % } +% if (@islandids==1) { +% if (defined $islandids[0]) { +Searched for arbitrage trades only. +% } else { +Searched for arbitrage trades only, in <% $archipelagoes[0] |h %> +[?]. +% } +% } + <%perl> my @sail_total; @@ -286,18 +292,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", $f->{Ix}, $sfi->[0] - }; - push @{ $f->{Subflows} }, $subflow; - push @subflows, $subflow; - } - $f->{MarginSortKey}= sprintf "%d", $f->{'dst_price'} * 10000 / $f->{'org_price'}; $f->{Margin}= sprintf "%3.1f%%", @@ -375,8 +369,23 @@ foreach my $f (@flows) { if (defined $qa->{"R$f->{UidShort}"} && !defined $qa->{"T$f->{UidShort}"}) { $f->{Suppress}= 1; + } else { + 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; + } } - } @@ -411,19 +420,12 @@ 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 '_', ( - 'avail', - $flow->{'commodid'}, $od, - $flow->{"${od}_id"}, + 'i'.$flow->{"${od}_id"}, + 'c'.$flow->{'commodid'}, $flow->{"${od}_price"}, $flow->{"${od}_stallid"}, ); @@ -464,7 +466,8 @@ foreach my $ci (0..($#islandids-1)) { } my $applylimit= sub { - my ($mv, $max, $f2val) = @_; + my ($mv, $f2val) = @_; + my $max= $routeparams->{"Max".ucfirst $mv}; $max= 1e9 unless defined $max; #print " DEFINED MAX $mv $max "; $cplex .= " @@ -476,9 +479,9 @@ foreach my $ci (0..($#islandids-1)) { " <= $max"; }; - $applylimit->('mass', $max_mass, sub { $_[0]{'unitmass'} *1e-3 }); - $applylimit->('volume', $max_volume, sub { $_[0]{'unitvolume'}*1e-3 }); - $applylimit->('capital',$max_capital,sub { $_[0]{'org_price'} }); + $applylimit->('mass', sub { $_[0]{'unitmass'} *1e-3 }); + $applylimit->('volume', sub { $_[0]{'unitvolume'}*1e-3 }); + $applylimit->('capital', sub { $_[0]{'org_price'} }); $cplex.= "\n"; } @@ -523,6 +526,9 @@ if ($qa->{'debug'}) { $found_section= 1; next; } + if (m/^Objective:\s+totalprofit = (\d+(?:\.\d*)?) /) { + $expected_total_profit= $1; + } next unless $found_section==1; if (!length $continuation) { next if !$continuation && m/^[- ]+$/; @@ -541,8 +547,8 @@ if ($qa->{'debug'}) { \s* \d+ \s+ (\w+) \s+ (?: [A-Z*]+ \s+ )? ([0-9.]+) \s - /x or die "$_ ?"; - if ($varname =~ m/^f(\d+)s(\d+)$/) { + /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; my @relsubflow= grep { $_->{Org} == $orgix } @@ -561,6 +567,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 { @@ -581,120 +588,32 @@ $addcols->({ Total => 0, DoReverse => 1, TotalSubflows => 1 }, qw( % } # ========== OPTIMISATION ========== -% my %ts_sortkeys; -% { -% my $cdspan= $qa->{ShowStalls} ? ' colspan=2' : ''; -% my $cdstall= $qa->{ShowStalls} ? 'Stall' : ''; - ---<% $qa->{ShowStalls} ? '' : '' %> -------% if ($optimise) { --% } - - - -% foreach my $col (@cols) { - - -
->Collect ->Deliver - -Collect -Deliver -Profit -Max - -Max -% if ($optimise) { -Planned -% } - -
-Island <% $cdstall %> -Island <% $cdstall %> -Commodity -Price -Qty -Price -Qty -Margin -Unit -Qty -Capital -Profit -Dist -Mass -Vol -% if ($optimise) { -Qty -Capital -Profit -% } -% } - -
-% } - -% foreach my $flowix (0..$#flows) { -% my $flow= $flows[$flowix]; -% my $rowid= "id_row_$flow->{UidShort}"; -
{UidShort} %> value=""> - {UidShort} %> value="" - <% $flow->{Suppress} ? '' : 'checked' %> > -% my $ci= 1; -% while ($ci < @cols) { -% my $col= $cols[$ci]; -% my $spec= { -% Span => 1, -% Align => ($col->{Text} ? '' : 'align=right') -% }; -% my $cn= $col->{Name}; -% my $v; -% if (!$col->{TotalSubflows}) { -% $v= $flow->{$cn}; -% } else { -% $v= 0; -% $v += $_->{$cn} foreach @{ $flow->{Subflows} }; -% } -% if ($col->{Special}) { $col->{Special}($flow,$col,$v,$spec); } -% $col->{Total} += $v -% if defined $col->{Total} and not $flow->{Suppress}; -% $v='' if !$col->{Text} && !$v; -% my $sortkey= $col->{SortColKey} ? -% $flow->{$col->{SortColKey}} : $v; -% $ts_sortkeys{$ci}{$rowid}= $sortkey; -{Span} ? "colspan=$spec->{Span}" : '' - %> <% $spec->{Align} - %>><% exists $spec->{String} ? $spec->{String} : $v |h %> -% $ci += $spec->{Span}; -% } +% if (!printable($m)) { +

Contents

+
-Total -% foreach my $ci (3..$#cols) { -% my $col= $cols[$ci]; - -% if (defined $col->{Total}) { -<% $col->{Total} |h %> -% } +
  • Data age summary +
  • Relevant trades + +% } 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 %>. % } -

    • - -<&| tabsort, cols => \@cols, table => 'trades', rowclass => 'datarow', - throw => 'trades_sort', tbrow => 'trades_total' &> - ts_sortkeys= <% to_json_protecttags(\%ts_sortkeys) %>; - - - % if ($optimise) { # ========== TRADING PLAN ========== % @@ -704,10 +623,18 @@ $addcols->({ Total => 0, DoReverse => 1, TotalSubflows => 1 }, qw( % my $total_total= 0; % my $total_dist= 0; % -

    Voyage trading plan

    - +

    Voyage trading plan

    + +
    > +% my $tbody= sub { +% if (!printable($m)) { return ''; } +%# return " +<% $tbody->(1) %> +<% $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 %> % @@ -833,7 +759,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); % } % @@ -858,14 +784,14 @@ $addcols->({ Total => 0, DoReverse => 1, TotalSubflows => 1 }, qw( $totals .= sprintf "%g %s", ($max-$got), $units; $delim= ', '; }; - $domv->($max_mass, $sail_total[$i]{mass}, 'kg'); - $domv->($max_volume, $sail_total[$i]{volume}, 'l'); + $domv->($routeparams->{MaxMass}, $sail_total[$i]{mass}, 'kg'); + $domv->($routeparams->{MaxVolume}, $sail_total[$i]{volume}, 'l'); $totals .= ".\n"; } $show_total_now->($totals); } - - + +<% $tbody->(1) %>
    "; +% my ($c)= qw(40 00)[$_[0]]; +% return "
    "; +% }; +% % foreach my $i (0..$#islandids) { -
    % $iquery->execute($islandids[$i]); % my ($islandname) = $iquery->fetchrow_array(); @@ -737,7 +664,6 @@ $addcols->({ Total => 0, DoReverse => 1, TotalSubflows => 1 }, qw( #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'}; @@ -812,12 +738,12 @@ $addcols->({ Total => 0, DoReverse => 1, TotalSubflows => 1 }, qw( (Data age: <% prettyprint_age($age) %>) % } elsif (!defined $total) { % $total= 0; -
    Total distance: <% $total_dist %> leagues. Overall net cash flow <% @@ -873,9 +799,177 @@ $addcols->({ Total => 0, DoReverse => 1, TotalSubflows => 1 }, qw( %>
    <& 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

    +<%perl> + my $sth_i= $dbh->prepare(<prepare(<fetchrow_hashref(); + if ($row) { + next if $idone{$row->{'islandid'}}++; + return $row; + } + } + return undef if $ix < 0; + my $iid= $islandids[$ix]; + if (defined $iid) { + $sth_i->execute($iid); + $sth_current= $sth_i; + } else { + my $arch= $archipelagoes[$ix]; + die unless defined $arch && length $arch; + $sth_a->execute($arch); + $sth_current= $sth_a; + } + $ix--; + } + }; + +<&| query_age:agestable, now => $now, fetchrow => $fetchrow &> +Islands shown in reverse order of visits.
    + +% } + +% if (!printable($m)) { +% my %ts_sortkeys; +% { +% my $cdspan= $qa->{ShowStalls} ? ' colspan=2' : ''; +% my $cdstall= $qa->{ShowStalls} ? 'Stall' : ''; +

    Relevant trades

    + +++<% $qa->{ShowStalls} ? '' : '' %> +++++++% if ($optimise) { ++% } + + + +% foreach my $col (@cols) { + + +
    +>Collect +>Deliver + +Collect +Deliver +Profit +Max + +Max +% if ($optimise) { +Planned +% } + +
    +Island <% $cdstall %> +Island <% $cdstall %> +Commodity +Price +Qty +Price +Qty +Margin +Unit +Qty +Capital +Profit +Dist +Mass +Vol +% if ($optimise) { +Qty +Capital +Profit +% } +% } + +
    +% } + +% foreach my $flowix (0..$#flows) { +% my $flow= $flows[$flowix]; +% my $rowid= "id_row_$flow->{UidShort}"; +
    {UidShort} %> value=""> + {UidShort} %> value="" + <% $flow->{Suppress} ? '' : 'checked' %> > +% my $ci= 1; +% while ($ci < @cols) { +% my $col= $cols[$ci]; +% my $spec= { +% Span => 1, +% Align => ($col->{Text} ? '' : 'align=right') +% }; +% my $cn= $col->{Name}; +% my $v; +% if (!$col->{TotalSubflows}) { +% $v= $flow->{$cn}; +% } else { +% $v= 0; +% $v += $_->{$cn} foreach @{ $flow->{Subflows} }; +% } +% if ($col->{Special}) { $col->{Special}($flow,$col,$v,$spec); } +% $col->{Total} += $v +% if defined $col->{Total} and not $flow->{Suppress}; +% $v='' if !$col->{Text} && !$v; +% my $sortkey= $col->{SortColKey} ? +% $flow->{$col->{SortColKey}} : $v; +% $ts_sortkeys{$ci}{$rowid}= $sortkey; +{Span} ? "colspan=$spec->{Span}" : '' + %> <% $spec->{Align} + %>><% exists $spec->{String} ? $spec->{String} : $v |h %> +% $ci += $spec->{Span}; +% } +% } +
    +Total +% foreach my $ci (3..$#cols) { +% my $col= $cols[$ci]; + +% if (defined $col->{Total}) { +<% $col->{Total} |h %> +% } +% } +
    + +<&| tabsort, cols => \@cols, table => 'trades', rowclass => 'datarow', + throw => 'trades_sort', tbrow => 'trades_total' &> + ts_sortkeys= <% to_json_protecttags(\%ts_sortkeys) %>; + +

    + + +% } # !printable + <%init> use CommodsWeb; use Commods;