X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2Fweb%2Froutetrade;h=d7679f8762a872cb00f548dcc19af92b2f36a763;hb=103338b957021f56c3d6a6a60230e6cf010a1d74;hp=c0fe98665c5760dd1312737abdef1b39cc802c8d;hpb=0759b42dbad7715339b0dceb5e910ea7698fa90a;p=ypp-sc-tools.main.git

diff --git a/yarrg/web/routetrade b/yarrg/web/routetrade
index c0fe986..d7679f8 100644
--- a/yarrg/web/routetrade
+++ b/yarrg/web/routetrade
@@ -54,7 +54,7 @@ my $loss_per_delay_slot= 1e-8;
 
 my $now= time;
 
-my %flow_conds;
+my @flow_conds;
 my @query_params;
 my %dists;
 
@@ -82,30 +82,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 +157,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 +292,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 +424,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"},
 		);
@@ -506,7 +512,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= '';
@@ -538,7 +545,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 }