From 4adafa149280c9ac2972582c05ae7859f3fddddf Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 27 Dec 2009 19:06:59 +0000 Subject: [PATCH] New Summary section --- yarrg/CommodsWeb.pm | 17 ++- yarrg/web/routetrade | 274 ++++++++++++++++++++++++++----------------- 2 files changed, 178 insertions(+), 113 deletions(-) diff --git a/yarrg/CommodsWeb.pm b/yarrg/CommodsWeb.pm index 5e12003..9a60836 100644 --- a/yarrg/CommodsWeb.pm +++ b/yarrg/CommodsWeb.pm @@ -52,7 +52,7 @@ BEGIN { &to_json_shim &to_json_protecttags &set_ctype_utf8 &webdatadir &expected_error &dbw_lookup_string - &printable &tr_datarow &escerrq + &printable &tr_datarow &tr_datarow_s &escerrq &prettyprint_age &meta_prettyprint_age); %EXPORT_TAGS = ( ); @@ -210,18 +210,23 @@ sub printable ($) { # printable($m) where $m is the Mason request object return 0; } -sub tr_datarow ($$) { +sub tr_datarow_s ($$) { my ($m, $lineno) = @_; $lineno &= 1; if (!printable($m)) { - $m->print(""); + return ""; } else { - $m->print(""); + return ""; } } +sub tr_datarow ($$) { + my ($m, $lineno) = @_; + $m->print(tr_datarow_s($m, $lineno)); +} + sub escerrq ($) { return '"'.CGI::escapeHTML($_[0]).'"'; # Prettier qotes as below are not in HTML 3.2: diff --git a/yarrg/web/routetrade b/yarrg/web/routetrade index b2bbf2e..8d8b48b 100644 --- a/yarrg/web/routetrade +++ b/yarrg/web/routetrade @@ -419,6 +419,7 @@ foreach my $f (@flows) { % my $optimise= 1; +% my $opt_how; % if (!$specific) { % $optimise= 0; @@ -505,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; @@ -581,7 +582,7 @@ if ($qa->{'debug'}) { } my $try_solve= sub { - my (@opts) = @_; + my ($how, @opts) = @_; my $input= pipethrough_prep(); print $input $cplex or die $!; my $output= pipethrough_run_along($input, undef, 'glpsol', @@ -645,7 +646,7 @@ my $try_solve= sub { $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; } @@ -655,11 +656,16 @@ my $try_solve= sub { pipethrough_run_finish($output,$prerr); map { defined $_->{OptQty} or die "$prerr $_->{Flow}{Ix}" } @subflows; defined $expected_total_profit or die "$prerr ?"; - return $somemip || !$timelimit; + return 0 unless $somemip || !$timelimit; + $opt_how= $how; + return 1; }; -unless ($try_solve->(qw( --intopt --cuts --bfs )) or - $try_solve->(qw( --nomip ))) { +unless ($try_solve->('Optimisation successful', + qw( --intopt --cuts --bfs )) or + $try_solve->('Complex problem, downgraded'. + ' to rounded-down LP.', + qw( --nomip ))) {

Optimisation failed

The linear/mixed-integer optimisation failed. @@ -694,9 +700,9 @@ $addcols->({ Total => 0, DoReverse => 1, TotalSubflows => 1 }, qw(

Contents

% } else { @@ -718,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 .= < +END - > -% my $tbody= sub { -% if (!printable($m)) { return ''; } -%# return " -% $iquery->execute($islandids[$i]); -% my ($islandname) = $iquery->fetchrow_array(); -% if (!$i) { +my $tbody= sub { + if (!printable($m)) { return ''; } + my ($c)= qw(40 00)[$_[0]]; + return "\n"; + $iquery->execute($islandids[$i]); + my ($islandnamepr)= encode_entities( $iquery->fetchrow_array() ); + + if (!$i) { + $plan_html .= < -Start at <% $islandname |h %> +Start at $islandnamepr -% } -<%perl> +END + } my $age_reported= 0; my %flowlists; #print " -
"; -% my ($c)= qw(40 00)[$_[0]]; -% return "
"; -% }; -% -% foreach my $i (0..$#islandids) { -<% $tbody->(1) %> -
"; +}; + +foreach my $i (0..$#islandids) { + $plan_html .= $tbody->(1); + $plan_html .= "
[what are these codes?] -% } else { -% my $this_dist= $distance->($islandids[$i-1],$islandids[$i]); -% $total_dist += $this_dist; +END + } else { + my $this_dist= $distance->($islandids[$i-1],$islandids[$i]); + $total_dist += $this_dist; + $plan_html .= < -<%perl> +END my $total_value= 0; foreach my $sf (@subflows) { next unless $sf->{Org} < $i && $sf->{Dst} >= $i; $total_value += $sf->{OptQty} * $sf->{Flow}{'dst_price'}; } - -Sail to <% $islandname |h %> -- <% $this_dist |h %> leagues, - <% $total_value %>poe at risk + $plan_html .= <Sail to $islandnamepr +- $this_dist leagues, $total_value poe at risk
" if $qa->{'debug'}; @@ -847,66 +859,72 @@ END my ($xinfo) = @_; return unless defined $total_to_show; my ($totaldesc,$totalwas) = @$total_to_show; - + $plan_html .= < -<% $xinfo %> -<% $totaldesc %> -<% $totalwas |h %> total -<%perl> +$xinfo +$totaldesc +$totalwas total +END $total_to_show= undef; }; - -% 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"; -% my %linkqf= (%{ $qa->{'baseqf'} }, %{ $qa->{'queryqf'} }); -% $linkqf{'query'}= 'commod'; -% $linkqf{'commodstring'}= $t->{'commodname'}; -% $linkqf{'commodid'}= $t->{'commodid'}; -% 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 .= <(Data age: $agepr) +END + } elsif (!defined $total) { + $total= 0; + $plan_html .= $tbody->(0); + } + $total += $t->{Total}; + my $span= 0 + keys %{ $t->{Stalls} }; + my $td= "td rowspan=$span"; + my %linkqf= (%{ $qa->{'baseqf'} }, %{ $qa->{'queryqf'} }); + $linkqf{'query'}= 'commod'; + $linkqf{'commodstring'}= $t->{'commodname'}; + $linkqf{'commodid'}= $t->{'commodid'}; + my $linkqfpr= $quri->(%linkqf); + my $commodnamepr= encode_entities($t->{'commodname'}); + $plan_html .= tr_datarow_s($m,$dline) . <$collectdeliver +<$td>$commodnamepr +<$td>$t->{'posinclass'} +END + my @stalls= sort keys %{ $t->{Stalls} }; + my $pstall= sub { + my $namepr= encode_entities( $stalls[$_[0]] ); + $plan_html .= <$namepr +END + }; + + $pstall->(0); + $plan_html .= <$t->{Price} poe ea. +<$td align=right>$t->{Qty} unit(s) +<$td align=right>$t->{Total} total +END + foreach my $stallix (1..$#stalls) { + tr_datarow_s($m,$dline); + $pstall->($stallix); + } + + $dline ^= 1; + } + }; $show_flows->('dst',0,'Deliver'); $show_total->('Proceeds',1); $show_flows->('org',1,'Collect'); $show_total->('(Arbitrage) outlay',-1); @@ -930,23 +948,65 @@ END } $show_total_now->($totals); } - -<% $tbody->(1) %>
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
+END + + +% if (!printable($m)) { +

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(<