\n" if $qa->{'debug'}; my $found_section= 0; @@ -524,7 +553,7 @@ if ($qa->{'debug'}) { $found_section= 1; next; } - if (m/^Objective:\s+totalprofit = (\d+\.\d*) /) { + if (m/^Objective:\s+totalprofit = (\d+(?:\.\d*)?) /) { $expected_total_profit= $1; } next unless $found_section==1; @@ -544,8 +573,8 @@ if ($qa->{'debug'}) { my ($varname, $qty) = m/^ \s* \d+ \s+ (\w+) \s+ (?: [A-Z*]+ \s+ )? - ([0-9.]+) \s - /x or die "$_ ?"; + ([+-e0-9.]+) \s + /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; @@ -565,6 +594,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 { @@ -603,6 +633,13 @@ $addcols->({ Total => 0, DoReverse => 1, TotalSubflows => 1 }, qw(
+Generated by YARRG at <% + sprintf "%04d-%02d-%02d %02d:%02d:%02d UTC", + $tl[5]+1900, @tl[4,3,2,1,0] + |h %>. % } % if ($optimise) { # ========== TRADING PLAN ========== @@ -615,7 +652,7 @@ $addcols->({ Total => 0, DoReverse => 1, TotalSubflows => 1 }, qw( %
"; @@ -625,14 +662,18 @@ $addcols->({ Total => 0, DoReverse => 1, TotalSubflows => 1 }, qw( % % foreach my $i (0..$#islandids) { <% $tbody->(1) %> - | |||||||||||||||||||||||||
+ | |||||||||||||||||||||||||
Start at <% $islandname |h %> + | [what are these codes?] + | % } else { % my $this_dist= $distance->($islandids[$i-1],$islandids[$i]); % $total_dist += $this_dist; + | <%perl> my $total_value= 0; foreach my $sf (@subflows) { @@ -649,12 +690,11 @@ $addcols->({ Total => 0, DoReverse => 1, TotalSubflows => 1 }, qw( <%perl> my $age_reported= 0; my %flowlists; - #print " | ||||||||||||||||||||||
" if $qa->{'debug'}; + #print " | |||||||||||||||||||||||||
" if $qa->{'debug'};
foreach my $od (qw(org dst)) {
#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'};
@@ -664,6 +704,7 @@ $addcols->({ Total => 0, DoReverse => 1, TotalSubflows => 1 }, qw(
my $price= $f->{"${od}_price"};
my $stallname= $f->{"${od}_stallname"};
my $todo= \$flowlists{$od}{
+ (sprintf "%010d", $f->{'ordval'}),
$f->{'commodname'},
(sprintf "%07d", ($od eq 'dst' ?
9999999-$price : $price)),
@@ -675,6 +716,33 @@ $addcols->({ Total => 0, DoReverse => 1, TotalSubflows => 1 }, qw(
dstArbitrage => 0,
} unless $$todo;
$$todo->{'commodname'}= $f->{'commodname'};
+ $$todo->{'posinclass'}= '';
+ my $incl= $f->{'posinclass'};
+
+ my $findclass= $dbh->prepare(< "
+ .$abbrev." ";
+ }
$$todo->{'stallname'}= $stallname;
$$todo->{Price}= $price;
$$todo->{Timestamp}= $f->{"${od}_timestamp"};
@@ -706,7 +774,7 @@ $addcols->({ Total => 0, DoReverse => 1, TotalSubflows => 1 }, qw(
%perl>
- | <% $xinfo %>
+ | <% $xinfo %>
| <% $totaldesc %>
| <% $totalwas |h %> total
<%perl>
@@ -737,6 +805,7 @@ $addcols->({ Total => 0, DoReverse => 1, TotalSubflows => 1 }, qw(
% tr_datarow($m,$dline);
<<% $td %>><% $collectdeliver %>
<<% $td %>><% $t->{'commodname'} |h %>
+<<% $td %>><% $t->{'posinclass'} %>
%
% my @stalls= sort keys %{ $t->{Stalls} };
% my $pstall= sub {
@@ -783,7 +852,7 @@ $addcols->({ Total => 0, DoReverse => 1, TotalSubflows => 1 }, qw(
}
%perl>
<% $tbody->(1) %> | Total distance: <% $total_dist %> leagues.
+ | Total distance: <% $total_dist %> leagues.
| Overall net cash flow
| <%
$total_total < 0 ? -$total_total." loss" : $total_total." gain"
@@ -840,14 +909,6 @@ END
<&| query_age:agestable, now => $now, fetchrow => $fetchrow &>
Islands shown in reverse order of visits. | &> -% } 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 %>.
-%#
% }
% if (!printable($m)) {
@@ -856,7 +917,7 @@ Generated by YARRG at <%
% my $cdspan= $qa->{ShowStalls} ? ' colspan=2' : '';
% my $cdstall= $qa->{ShowStalls} ? '
% } # !printable
|