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=b2bbf2e04da0386c20464edcd83a4916dbf8e419;hp=ce319facae713bb9e32edddf86a1509d979b4772;hb=55776234257e165e887a1695d92cd569a63a13e7;hpb=29010a75143814a91b4f5200454bea879280e7c1 diff --git a/yarrg/web/routetrade b/yarrg/web/routetrade index ce319fa..b2bbf2e 100644 --- a/yarrg/web/routetrade +++ b/yarrg/web/routetrade @@ -39,6 +39,8 @@ $dbh @archipelagoes $qa $routeparams +$reset_suppressions +$quri <& query_age:pageload &> @@ -47,6 +49,9 @@ $routeparams my $loss_per_league= defined $routeparams->{LossPerLeaguePct} ? $routeparams->{LossPerLeaguePct}*0.01 : 1e-7; my $loss_per_delay_slot= 1e-8; +my $max_gems= 24; + +my $minprofit= $routeparams->{MinProfit} || 0; my $now= time; @@ -140,6 +145,10 @@ my $stmt= " commods.commodid commodid, commods.unitmass unitmass, commods.unitvolume unitvolume, + commods.ordval ordval, + commods.posinclass posinclass, + commods.commodclassid commodclassid, + commods.flags flags, dist dist, buy.price - sell.price unitprofit FROM commods @@ -272,13 +281,21 @@ Searched for arbitrage trades only, in <% $archipelagoes[0] |h %> <%perl> -my @sail_total; - if (!@flows) { print 'No profitable trading opportunities were found.'; return; } +my @sail_total; +my %opportunity_value; + +my $oppo_key= sub { + my ($f) = @_; + return join '_', map { $f->{$_} } qw(org_id dst_id commodid); +}; + +my $any_previous_suppression= 0; + foreach my $f (@flows) { $f->{MaxQty}= $f->{'org_qty_agg'} < $f->{'dst_qty_agg'} @@ -303,6 +320,8 @@ foreach my $f (@flows) { $dists{'org_id'}{'dst_id'}= $f->{'dist'}; + $opportunity_value{ $oppo_key->($f) } += $f->{MaxProfit}; + my @uid= $f->{commodid}; foreach my $od (qw(org dst)) { push @uid, @@ -365,11 +384,21 @@ foreach my $f (@flows) { $f->{UidLong} eq $recons_long or die "$f->{UidLong} = $f->{UidShort} = $recons_long ?"; } +} - if (defined $qa->{"R$f->{UidShort}"} && - !defined $qa->{"T$f->{UidShort}"}) { - $f->{Suppress}= 1; +foreach my $f (@flows) { + + if ($reset_suppressions || !defined $qa->{"R$f->{UidShort}"}) { + if ($opportunity_value{ $oppo_key->($f) } < $minprofit) { + $f->{Suppress}= 1; + } } else { + if (!defined $qa->{"T$f->{UidShort}"}) { + $any_previous_suppression= 1; + $f->{Suppress}= 1; + } + } + if (!$f->{Suppress}) { my $sfis= $ipair2subflowinfs{$f->{'org_id'},$f->{'dst_id'}}; foreach my $sfi (@$sfis) { my $subflow= { @@ -389,13 +418,24 @@ foreach my $f (@flows) { } -% my $optimise= $specific; -% if (!$optimise) { +% my $optimise= 1; -

% if (!$specific) { +% $optimise= 0; Route contains archipelago(es), not just specific islands. +% } elsif (!@subflows) { +% $optimise= 0; +% if ($any_previous_suppression) { +All available trades deselected. +% } else { +No available trades meet the specified minimum trade value, so +all available trades deselected. +% } % } + +% if (!$optimise) { + +

Therefore, optimal voyage trade plan not calculated. % } else { # ========== OPTMISATION ========== @@ -407,11 +447,17 @@ Maximize totalprofit: "; +my %stall_poe_limits; + foreach my $sf (@subflows) { my $eup= $sf->{Flow}{ExpectedUnitProfit}; $eup *= (1.0-$loss_per_delay_slot) ** $sf->{Org}; $cplex .= sprintf " %+.20f %s", $eup, $sf->{Var}; + if ($qa->{ShowStalls}>=2) { + my $stall= $sf->{Flow}{'dst_stallid'}; + push @{ $stall_poe_limits{$stall} }, $sf; + } } $cplex .= " @@ -482,6 +528,32 @@ foreach my $ci (0..($#islandids-1)) { $applylimit->('mass', sub { $_[0]{'unitmass'} *1e-3 }); $applylimit->('volume', sub { $_[0]{'unitvolume'}*1e-3 }); $applylimit->('capital', sub { $_[0]{'org_price'} }); + + my @gem_subflows= grep { $_->{Flow}{flags} =~ m/g/ } @rel_subflows; + if (@gem_subflows) { + $cplex .= " + ". sprintf("%-10s","gems_$ci:")." ". + join(" + ", map { $_->{Var} } @gem_subflows). " <= $max_gems"; + } + + $cplex.= "\n"; +} + +if ($qa->{ShowStalls}>=2) { + my $stallpoe= $dbh->prepare(< $b } keys %stall_poe_limits) { + $stallpoe->execute($stallid); + my ($lim)= $stallpoe->fetchrow_array(); + $stallpoe->finish(); + $cplex.= " + ". sprintf("%-15s","poe_$stallid:")." ". + join(" + ", map { + sprintf "%d %s", $_->{Flow}{'dst_price'}, $_->{Var}; + } @{ $stall_poe_limits{$stallid} }). + " <= $lim"; + } $cplex.= "\n"; } @@ -508,16 +580,23 @@ if ($qa->{'debug'}) { <%perl> } -{ +my $try_solve= sub { + my (@opts) = @_; my $input= pipethrough_prep(); print $input $cplex or die $!; my $output= pipethrough_run_along($input, undef, 'glpsol', - qw(glpsol --tmlim 2 --memlim 5 --intopt --cuts --bfs - --cpxlp /dev/stdin -o /dev/stdout)); - print "

\n" if $qa->{'debug'};
+		qw(glpsol --tmlim 1 --memlim 5), @opts,
+		qw( --cpxlp /dev/stdin -o /dev/stdout));
+	if ($qa->{'debug'}) {
+		print "

@opts

\n
\n";
+	}
+	$expected_total_profit= undef;
+	$_->{OptQty}= undef foreach @subflows;
 	my $found_section= 0;
 	my $glpsol_out= '';
 	my $continuation='';
+	my $timelimit= 0;
+	my $somemip= 0;
 	while (<$output>) {
 		$glpsol_out.= $_;
 		print encode_entities($_) if $qa->{'debug'};
@@ -526,6 +605,14 @@ if ($qa->{'debug'}) {
 			$found_section= 1;
 			next;
 		}
+		if ((m/^Integer optimization begins/ .. 0) &&
+		    m/^\+ \s* \d+\: \s* mip \s* = \s* \d/) {
+			$somemip= 1;
+			next;
+		}
+		if (m/^TIME LIMIT EXCEEDED/) {
+			$timelimit= 1;
+		}
 		if (m/^Objective:\s+totalprofit = (\d+(?:\.\d*)?) /) {
 			$expected_total_profit= $1;
 		}
@@ -546,7 +633,7 @@ if ($qa->{'debug'}) {
 		my ($varname, $qty) = m/^
 			\s* \d+ \s+
 			(\w+) \s+ (?: [A-Z*]+ \s+ )?
-			([0-9.]+) \s
+			([-+0-9]+)(?: [.e][-+e0-9.]* )? \s
 			/x or die "$cplex \n==\n $glpsol_out $_ ?";
 		if ($varname =~ m/^f(\d+)s(\d+)_/) {
 			my ($ix,$orgix) = ($1,$2);
@@ -568,8 +655,23 @@ if ($qa->{'debug'}) {
 	pipethrough_run_finish($output,$prerr);
 	map { defined $_->{OptQty} or die "$prerr $_->{Flow}{Ix}" } @subflows;
 	defined $expected_total_profit or die "$prerr ?";
+	return $somemip || !$timelimit;
 };
 
+unless ($try_solve->(qw( --intopt --cuts --bfs )) or
+	$try_solve->(qw( --nomip ))) {
+
+

Optimisation failed

+The linear/mixed-integer optimisation failed. +Please report this problem. + +
+<% $cplex |h %>
+
+<%perl> + return; +} + $addcols->({ DoReverse => 1, TotalSubflows => 1, Special => sub { my ($flow,$col,$v,$spec) = @_; if ($flow->{ExpectedUnitProfit} < 0) { @@ -635,14 +737,18 @@ Generated by YARRG at <% % % foreach my $i (0..$#islandids) { <% $tbody->(1) %> - + % $iquery->execute($islandids[$i]); % my ($islandname) = $iquery->fetchrow_array(); % if (!$i) { + 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) { @@ -659,7 +765,7 @@ Generated by YARRG at <% <%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) { @@ -673,6 +779,7 @@ Generated by YARRG at <% 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)), @@ -683,7 +790,35 @@ Generated by YARRG at <% orgArbitrage => 0, dstArbitrage => 0, } unless $$todo; + $$todo->{'commodid'}= $f->{'commodid'}; $$todo->{'commodname'}= $f->{'commodname'}; + $$todo->{'posinclass'}= ''; + my $incl= $f->{'posinclass'}; + + my $findclass= $dbh->prepare(<execute($f->{'commodclassid'}); + my $classinfo= $findclass->fetchrow_hashref(); + if ($classinfo) { + my $clname= $classinfo->{'commodclass'}; + my $desc= encode_entities(sprintf "%s is under %s", + $f->{'commodname'}, $clname); + my $abbrev= substr($clname,0,1); + if ($incl) { + my $maxpic= $classinfo->{'maxposinclass'}; + $desc.= (sprintf ", commodity %d of %d", + $incl, $maxpic); + if ($classinfo->{'maxposinclass'} >= 8) { + my @tmbs= qw(0 1 2 3 4 5 6 7 8 9); + my $tmbi= ($incl+0.5)*$#tmbs/$maxpic; + $abbrev.= " ".$tmbs[$tmbi]." "; + } + } + $$todo->{'posinclass'}= + "
" + .$abbrev."
"; + } $$todo->{'stallname'}= $stallname; $$todo->{Price}= $price; $$todo->{Timestamp}= $f->{"${od}_timestamp"}; @@ -715,7 +850,7 @@ Generated by YARRG at <% -<% $xinfo %> +<% $xinfo %> <% $totaldesc %> <% $totalwas |h %> total <%perl> @@ -743,9 +878,14 @@ Generated by YARRG at <% % $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->{'commodname'} |h %> +<<% $td %>><% $t->{'posinclass'} %> % % my @stalls= sort keys %{ $t->{Stalls} }; % my $pstall= sub { @@ -792,7 +932,7 @@ Generated by YARRG at <% } <% $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"