X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-live.git;a=blobdiff_plain;f=yarrg%2Fweb%2Froutetrade;h=f9ebfeaf3f60fa783ce8c796090906d38c4eefc0;hp=4be17c6e1a791a2ae952191137dfe22b561adf6a;hb=d66f27768708df0b8ce256e2d868ff4f7060ef3f;hpb=318cd4aab5ab06cf6a5f36553654ea97d3940839

diff --git a/yarrg/web/routetrade b/yarrg/web/routetrade
index 4be17c6..f9ebfea 100644
--- a/yarrg/web/routetrade
+++ b/yarrg/web/routetrade
@@ -54,9 +54,10 @@ my $loss_per_delay_slot= 1e-8;
 
 my $now= time;
 
-my %flow_conds;
+my @flow_conds;
 my @query_params;
 my %dists;
+my $expected_total_profit;
 
 my $sd_condition= sub {
 	my ($bs, $ix) = @_;
@@ -82,30 +83,33 @@ my @subflows;
 foreach my $org_i (0..$#islandids) {
 	my $org_isle= $islandids[$org_i];
 	my $org_cond= $sd_condition->('sell',$org_i);
-	my %dst_conds;
+	my @dst_conds;
 	foreach my $dst_i ($org_i..$#islandids) {
 		my $dst_isle= $islandids[$dst_i];
 		# Don't ever consider sailing things round the houses:
-		next if grep { $dst_isle == $_ } @islandids[$org_i..$dst_i-1];
-		next if grep { $org_isle == $_ } @islandids[$org_i+1..$dst_i];
-		my $dst_cond= $sd_condition->('buy',$dst_i);
+		next if defined $dst_isle and
+			grep { $dst_isle == $_ } @islandids[$org_i..$dst_i-1];
+		next if defined $org_isle and
+			grep { $org_isle == $_ } @islandids[$org_i+1..$dst_i];
+		my $dst_cond;
 		if ($dst_i==$org_i and !defined $org_isle) {
 			# we always want arbitrage, but mentioning an arch
 			# once shouldn't produce intra-arch trades
-			$dst_cond=
-				"($dst_cond AND sell.islandid = buy.islandid)";
+			$dst_cond= "sell.islandid = buy.islandid";
+		} else {
+			$dst_cond= $sd_condition->('buy',$dst_i);
 		}
-		$dst_conds{$dst_cond}= 1;
+		push @dst_conds, $dst_cond;
 
 		if ($specific) {
 			push @{ $ipair2subflowinfs{$org_isle,$dst_isle} },
 				[ $org_i, $dst_i ];
 		}
 	}
-	$flow_conds{ "$org_cond AND (
+	push @flow_conds, "$org_cond AND (
 			".join("
-		     OR ", sort keys %dst_conds)."
-		)" }= 1;
+		     OR ",@dst_conds)."
+		)";
 }
 
 my $stmt= "		
@@ -154,7 +158,7 @@ my $stmt= "
 	JOIN dists ON aiid = sell.islandid AND biid = buy.islandid
 	WHERE	(
 		".join("
-	   OR	", sort keys %flow_conds)."
+	   OR	", @flow_conds)."
 	)
 	  AND	buy.price > sell.price
 	ORDER BY org_name, dst_name, commodname, unitprofit DESC,
@@ -289,7 +293,11 @@ foreach my $f (@flows) {
 			Flow => $f,
 			Org => $sfi->[0],
 			Dst => $sfi->[1],
-			Var => sprintf "f%ss%s", $f->{Ix}, $sfi->[0]
+			Var => sprintf "f%ss%s_c%d_p%d_%d_p%d_%d",
+				$f->{Ix}, $sfi->[0],
+				$f->{'commodid'},
+				$sfi->[0], $f->{'org_price'},
+				$sfi->[1], $f->{'dst_price'}
 		};
 		push @{ $f->{Subflows} }, $subflow;
 		push @subflows, $subflow;
@@ -417,10 +425,9 @@ foreach my $flow (@flows) {
 	}
 	foreach my $od (qw(org dst)) {
 		my $limname= join '_', (
-			'avail',
-			$flow->{'commodid'},
 			$od,
-			$flow->{"${od}_id"},
+			'i'.$flow->{"${od}_id"},
+			'c'.$flow->{'commodid'},
 			$flow->{"${od}_price"},
 			$flow->{"${od}_stallid"},
 		);
@@ -462,7 +469,7 @@ foreach my $ci (0..($#islandids-1)) {
 
 	my $applylimit= sub {
 		my ($mv, $max, $f2val) = @_;
-		return unless defined $max;
+		$max= 1e9 unless defined $max;
 #print " DEFINED MAX $mv $max ";
 		$cplex .= "
    ". sprintf("%-10s","${mv}_$ci:")." ".
@@ -506,7 +513,8 @@ if ($qa->{'debug'}) {
 	my $input= pipethrough_prep();
 	print $input $cplex or die $!;
 	my $output= pipethrough_run_along($input, undef, 'glpsol',
-		qw(glpsol --cpxlp /dev/stdin -o /dev/stdout));
+		qw(glpsol --tmlim 2 --memlim 5 --intopt --cuts --bfs
+		          --cpxlp /dev/stdin -o /dev/stdout));
 	print "<pre>\n" if $qa->{'debug'};
 	my $found_section= 0;
 	my $glpsol_out= '';
@@ -519,6 +527,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/^[- ]+$/;
@@ -538,7 +549,7 @@ if ($qa->{'debug'}) {
 			(\w+) \s+ (?: [A-Z*]+ \s+ )?
 			([0-9.]+) \s
 			/x or die "$_ ?";
-		if ($varname =~ m/^f(\d+)s(\d+)$/) {
+		if ($varname =~ m/^f(\d+)s(\d+)_/) {
 			my ($ix,$orgix) = ($1,$2);
 			my $flow= $flows[$ix] or die;
 			my @relsubflow= grep { $_->{Org} == $orgix }
@@ -844,7 +855,7 @@ $addcols->({ Total => 0, DoReverse => 1, TotalSubflows => 1 }, qw(
      $show_flows->('org',0,'Collect'); $show_total->('Outlay',-1);
      my $totals= '';
      if ($i < $#islandids) {
-	$totals .= 	"Hold: $sail_total[$i]{mass}kg,".
+	$totals .= 	"In hold $sail_total[$i]{mass}kg,".
 			" $sail_total[$i]{volume} l";
 	my $delim= '; spare ';
 	my $domv= sub {
@@ -869,6 +880,9 @@ $addcols->({ Total => 0, DoReverse => 1, TotalSubflows => 1 }, qw(
  %></strong>
 </table>
 <& query_age:dataages, id2age => \%da_ages &>
+Expected average profit:
+ approx. <strong><% sprintf "%d", $expected_total_profit %></strong> poe
+ (considering expected losses, but ignoring rum consumed)
 %
 % } # ========== TRADING PLAN ==========