my @flow_conds;
my @query_params;
+my %dists;
my $sd_condition= sub {
my ($bs, $ix) = @_;
if ($specific && !$confusing &&
# With a circular route, do not carry goods round the loop
- !($src_i==0 && $dst_i==$#islandids &&
+ !(($src_i==0 || $src_i==$#islandids) &&
+ $dst_i==$#islandids &&
$src_isle == $islandids[$dst_i])) {
if ($islandpair{$src_isle,$dst_isle}) {
$confusing= 1;
+print "confusing $src_i $src_isle $dst_i $dst_isle\n";
} else {
$islandpair{$src_isle,$dst_isle}=
[ $src_i, $dst_i ];
$sth->execute(@query_params);
my @flows;
+my $distquery= $dbh->prepare("
+ SELECT dist FROM dists WHERE aiid = ? AND biid = ?
+ ");
+my $distance= sub {
+ my ($from,$to)= @_;
+ my $d= $dists{$from}{$to};
+ return $d if defined $d;
+ $distquery->execute($from,$to);
+ $d = $distquery->fetchrow_array();
+ defined $d or die "$from $to ?";
+ $dists{$from}{$to}= $d;
+ return $d;
+};
+
my @cols= ({ NoSort => 1 });
my $addcols= sub {
qw( Margin
));
$addcols->({ DoReverse => 1 },
- qw( unitprofit MaxQty
+ qw( unitprofit dist MaxQty
MaxCapital MaxProfit
));
% }
<%perl>
+
+if (!@flows) {
+ print 'No profitable trading opportunities were found.';
+ return;
+}
+
foreach my $f (@flows) {
$f->{MaxQty}= $f->{'org_qty_agg'} < $f->{'dst_qty_agg'}
$f->{'dst_price'} * (1.0 - $loss_per_league) ** $f->{'dist'}
- $f->{'org_price'};
+ $dists{'org_id'}{'dst_id'}= $f->{'dist'};
+
my @uid= $f->{commodid};
foreach my $od (qw(org dst)) {
push @uid,
Route is complex - it visits the same island several times
and isn't a simple loop.
% }
-Therefore, optimal trade pattern not calculated.
+Therefore, optimal voyage trade plan not calculated.
% } else { # ========== OPTMISATION ==========
<%perl>
qw(glpsol --cpxlp /dev/stdin -o /dev/stdout));
print "<pre>\n" if $qa->{'debug'};
my $found_section= 0;
+ my $glpsol_out= '';
while (<$output>) {
+ $glpsol_out.= $_;
print encode_entities($_) if $qa->{'debug'};
if (m/^\s*No\.\s+Column name\s+St\s+Activity\s/) {
die if $found_section>0;
$flow->{OptCapital}= $flow->{OptQty} * $flow->{'org_price'};
}
print "</pre>\n" if $qa->{'debug'};
- pipethrough_run_finish($output, 'glpsol');
- die unless $found_section;
+ my $prerr= "\n=====\n$cplex\n=====\n$glpsol_out\n=====\n ";
+ pipethrough_run_finish($output,$prerr);
+ die $prerr unless $found_section;
};
$addcols->({ DoReverse => 1 }, qw(
<colgroup span=2>
<colgroup span=2>
<colgroup span=2>
+<colgroup span=1>
<colgroup span=3>
% if ($optimise) {
<colgroup span=3>
<th colspan=2>Collect
<th colspan=2>Deliver
<th colspan=2>Profit
+<th colspan=1>
<th colspan=3>Max
% if ($optimise) {
<th colspan=3>Planned
<th>Qty
<th>Margin
<th>Unit
+<th>Dist
<th>Qty
<th>Capital
<th>Profit
% }
</table>
-<& tabsort, cols => \@cols, table => 'trades', rowclass => 'datarow',
+<&| tabsort, cols => \@cols, table => 'trades', rowclass => 'datarow',
throw => 'trades_sort', tbrow => 'trades_total' &>
-<&| script &>
ts_sortkeys= <% to_json_protecttags(\%ts_sortkeys) %>;
- function all_onload() {
- ts_onload__trades();
- }
- window.onload= all_onload;
-</&script>
+</&tabsort>
<input type=submit name=update value="Update">
% my $iquery= $dbh->prepare('SELECT islandname FROM islands
% WHERE islandid = ?');
% my %da_ages;
+% my $total_total= 0;
+% my $total_dist= 0;
%
<h1>Voyage trading plan</h1>
<table rules=groups>
% foreach my $i (0..$#islandids) {
<tbody>
-<tr><td colspan=3><strong>
+<tr><td colspan=3>
% $iquery->execute($islandids[$i]);
% my ($islandname) = $iquery->fetchrow_array();
+% my $this_dist= $distance->($islandids[$i-1],$islandids[$i]);
+% $total_dist += $this_dist;
% if (!$i) {
-Start at <% $islandname |h %>
+<strong>Start at <% $islandname |h %></strong>
% } else {
-Sail to <% $islandname |h %>
+<strong>Sail to <% $islandname |h %></strong>
+- <% $this_dist |h %> leagues </td>
% }
-</strong>
<%perl>
my $age_reported= 0;
my %flowlists;
next if $f->{Suppress};
next unless $f->{"${od}_id"} == $islandids[$i];
next unless $f->{OptQty};
+ my $arbitrage= $f->{'org_id'} == $f->{'dst_id'};
+ my $loop= $islandids[0] == $islandids[-1] &&
+ ($i==0 || $i==$#islandids);
+ next if $loop and ($arbitrage ? $i :
+ !!$i == !!($od eq 'org'));
my $price= $f->{"${od}_price"};
my $stallname= $f->{"${od}_stallname"};
my $todo= \$flowlists{$od}{
$$todo->{Qty} += $f->{OptQty};
$$todo->{Total}= $$todo->{Price} * $$todo->{Qty};
$$todo->{Stalls}= $f->{"${od}Stalls"};
- if ($f->{'org_id'} == $f->{'dst_id'}) {
- $$todo->{"${od}Arbitrage"}= 1;
- }
+ $$todo->{"${od}Arbitrage"}= 1 if $arbitrage;
}
}
% }
% };
% my $show_total= sub {
-% my ($totaldesc)= @_;
+% my ($totaldesc, $sign)= @_;
% if (defined $total) {
<tr>
<td colspan=3>
<td colspan=2 align=right><% $totaldesc %>
<td align=right><% $total |h %> total
+% $total_total += $sign * $total;
% }
% $total= undef;
% $dline= 0;
<%perl>
};
- $show_flows->('dst',0,'Deliver'); $show_total->('Proceeds');
- $show_flows->('org',1,'Collect'); $show_total->('(Arbitrage) outlay');
- $show_flows->('dst',1,'Deliver'); $show_total->('(Arbitrage) proceeds');
- $show_flows->('org',0,'Collect'); $show_total->('Outlay');
+ $show_flows->('dst',0,'Deliver'); $show_total->('Proceeds',1);
+ $show_flows->('org',1,'Collect'); $show_total->('(Arbitrage) outlay',-1);
+ $show_flows->('dst',1,'Deliver'); $show_total->('(Arbitrage) proceeds',1);
+ $show_flows->('org',0,'Collect'); $show_total->('Outlay',-1);
}
</%perl>
+<tbody><tr>
+<td colspan=2>Total distance: <% $total_dist %> leagues.
+<td colspan=3 align=right>Overall net cash flow
+<td align=right><strong><%
+ $total_total < 0 ? -$total_total." loss" : $total_total." gain"
+ %></strong>
</table>
<& query_age:dataages, id2age => \%da_ages &>
%