X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2Fweb%2Froutetrade;h=61484391130a9341b3b90d099c4b2889f27d0619;hb=ce49620ef8a4e24daa206185138919bb58d35d37;hp=d7679f8762a872cb00f548dcc19af92b2f36a763;hpb=103338b957021f56c3d6a6a60230e6cf010a1d74;p=ypp-sc-tools.db-live.git
diff --git a/yarrg/web/routetrade b/yarrg/web/routetrade
index d7679f8..6148439 100644
--- a/yarrg/web/routetrade
+++ b/yarrg/web/routetrade
@@ -38,10 +38,7 @@ $dbh
@islandids
@archipelagoes
$qa
-$max_mass
-$max_volume
-$lossperleaguepct
-$max_capital
+$routeparams
%args>
<&| script &>
da_pageload= Date.now();
@@ -49,7 +46,8 @@ $max_capital
<%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 +55,7 @@ my $now= time;
my @flow_conds;
my @query_params;
my %dists;
+my $expected_total_profit;
my $sd_condition= sub {
my ($bs, $ix) = @_;
@@ -467,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 .= "
@@ -479,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";
}
@@ -526,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/^[- ]+$/;
@@ -584,120 +587,16 @@ $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) {
-
-% }
-
-
- | >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
-% }
+Contents
+ |
-
-<&| tabsort, cols => \@cols, table => 'trades', rowclass => 'datarow',
- throw => 'trades_sort', tbrow => 'trades_total' &>
- ts_sortkeys= <% to_json_protecttags(\%ts_sortkeys) %>;
-&tabsort>
-
-
+ Relevant trades
+
% if ($optimise) { # ========== TRADING PLAN ==========
%
@@ -707,7 +606,8 @@ $addcols->({ Total => 0, DoReverse => 1, TotalSubflows => 1 }, qw(
% my $total_total= 0;
% my $total_dist= 0;
%
-Voyage trading plan
+
+
% foreach my $i (0..$#islandids) {
@@ -861,13 +761,13 @@ $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);
}
-%perl>
+%perl>
Total distance: <% $total_dist %> leagues.
| Overall net cash flow
@@ -876,9 +776,128 @@ $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 ==========
+% my %ts_sortkeys;
+% {
+% my $cdspan= $qa->{ShowStalls} ? ' colspan=2' : '';
+% my $cdstall= $qa->{ShowStalls} ? 'Stall | ' : '';
+
+
+
+<&| tabsort, cols => \@cols, table => 'trades', rowclass => 'datarow',
+ throw => 'trades_sort', tbrow => 'trades_total' &>
+ ts_sortkeys= <% to_json_protecttags(\%ts_sortkeys) %>;
+&tabsort>
+
+
+
<%init>
use CommodsWeb;
use Commods;