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=c62ca60b7f89a7956008cacc7c8998ae944a72c7;hp=b2bbf2e04da0386c20464edcd83a4916dbf8e419;hb=HEAD;hpb=55776234257e165e887a1695d92cd569a63a13e7 diff --git a/yarrg/web/routetrade b/yarrg/web/routetrade index b2bbf2e..c62ca60 100644 --- a/yarrg/web/routetrade +++ b/yarrg/web/routetrade @@ -419,6 +419,7 @@ foreach my $f (@flows) { %perl> % 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,11 +582,11 @@ 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', - qw(glpsol --tmlim 1 --memlim 5), @opts, + qw(glpsol --tmlim 5 --memlim 20), @opts, qw( --cpxlp /dev/stdin -o /dev/stdout)); if ($qa->{'debug'}) { print "
\n"; @@ -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 ))) { %perl>Optimisation failed
The linear/mixed-integer optimisation failed. @@ -694,9 +700,9 @@ $addcols->({ Total => 0, DoReverse => 1, TotalSubflows => 1 }, qw(Contents
"; -% 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 $age_reported= 0;
my %flowlists;
#print "|||||||||||||||||||||||||||||||||||
" if $qa->{'debug'};
@@ -847,66 +859,72 @@ END
my ($xinfo) = @_;
return unless defined $total_to_show;
my ($totaldesc,$totalwas) = @$total_to_show;
-%perl>
+ $plan_html .= <
- | <% $xinfo %>
- | <% $totaldesc %>
- | <% $totalwas |h %> total
-<%perl>
+ | $xinfo
+ | $totaldesc
+ | $totalwas total
+END
$total_to_show= undef;
};
-%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};
-% 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 .= < | 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
| |
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 %> + |
+ +