X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.main.git;a=blobdiff_plain;f=yarrg%2Fweb%2Froutetrade;h=ce319facae713bb9e32edddf86a1509d979b4772;hp=71cdbd2152b7ba870e9cb4994e9993758f16a84d;hb=05a607330cc73832ccc778cd10f69cbac8e6dba3;hpb=764f11c76036161975282b87c4cc4298be5d1088

diff --git a/yarrg/web/routetrade b/yarrg/web/routetrade
index 71cdbd2..ce319fa 100644
--- a/yarrg/web/routetrade
+++ b/yarrg/web/routetrade
@@ -261,6 +261,15 @@ foreach my $v (qw(MaxMass MaxVolume)) {
 <& dumptable:end, qa => $qa &>
 % }
 
+% if (@islandids==1) {
+% 	if (defined $islandids[0]) {
+Searched for arbitrage trades only.
+%	} else {
+Searched for arbitrage trades only, in <% $archipelagoes[0] |h %>
+<a href="docs#arbitrage">[?]</a>.
+%	}
+% }
+
 <%perl>
 
 my @sail_total;
@@ -283,22 +292,6 @@ foreach my $f (@flows) {
 		$f->{"Max$v"}= sprintf "%.1f", $f->{"Max${v}SortKey"} * 1e-6;
 	}
 
-	my $sfis= $ipair2subflowinfs{$f->{'org_id'},$f->{'dst_id'}};
-	foreach my $sfi (@$sfis) {
-		my $subflow= {
-			Flow => $f,
-			Org => $sfi->[0],
-			Dst => $sfi->[1],
-			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;
-	}
-
 	$f->{MarginSortKey}= sprintf "%d",
 		$f->{'dst_price'} * 10000 / $f->{'org_price'};
 	$f->{Margin}= sprintf "%3.1f%%",
@@ -376,8 +369,23 @@ foreach my $f (@flows) {
 	if (defined $qa->{"R$f->{UidShort}"} &&
 	    !defined $qa->{"T$f->{UidShort}"}) {
 		$f->{Suppress}= 1;
+	} else {
+		my $sfis= $ipair2subflowinfs{$f->{'org_id'},$f->{'dst_id'}};
+		foreach my $sfi (@$sfis) {
+			my $subflow= {
+				Flow => $f,
+				Org => $sfi->[0],
+				Dst => $sfi->[1],
+				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;
+		}
 	}
-
 }
 </%perl>
 
@@ -412,13 +420,7 @@ Subject To
 
 my %avail_lims;
 foreach my $flow (@flows) {
-	if ($flow->{Suppress}) {
-		foreach my $sf (@{ $flow->{Subflows} }) {
-			$cplex .= "
-   $sf->{Var} = 0";
-		}
-		next;
-	}
+	next if $flow->{Suppress};
 	foreach my $od (qw(org dst)) {
 		my $limname= join '_', (
 			$od,
@@ -524,7 +526,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;
@@ -545,7 +547,7 @@ if ($qa->{'debug'}) {
 			\s* \d+ \s+
 			(\w+) \s+ (?: [A-Z*]+ \s+ )?
 			([0-9.]+) \s
-			/x or die "$_ ?";
+			/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 +567,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 +606,13 @@ $addcols->({ Total => 0, DoReverse => 1, TotalSubflows => 1 }, qw(
  <li><a href="#dataage">Data age summary</a>
  <li><a href="#trades">Relevant trades</a>
 </ul>
+% } else {
+%	my @tl= gmtime $now or die $!;
+<p>
+Generated by YARRG at <strong><%
+	sprintf "%04d-%02d-%02d %02d:%02d:%02d UTC",
+		$tl[5]+1900, @tl[4,3,2,1,0]
+			|h %></strong>.
 % }
 
 % if ($optimise) { # ========== TRADING PLAN ==========
@@ -615,7 +625,7 @@ $addcols->({ Total => 0, DoReverse => 1, TotalSubflows => 1 }, qw(
 %
 <h2><a name="plan">Voyage trading plan</a></h2>
 
-<table rules=groups>
+<table class="data" rules=groups <% printable($m) ? 'width=100%' : '' %> >
 % my $tbody= sub {
 %	if (!printable($m)) { return '<tbody>'; }
 %#  return "<tr><td colspan=7><hr>";
@@ -654,7 +664,6 @@ $addcols->({ Total => 0, DoReverse => 1, TotalSubflows => 1 }, qw(
 	#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'};
@@ -840,14 +849,6 @@ END
 <&| query_age:agestable, now => $now, fetchrow => $fetchrow &>
 Islands shown in reverse order of visits.<br>
 </&>
-% } else {
-%	my @tl= gmtime $now or die $!;
-<p>
-Generated by YARRG at <strong><%
-	sprintf "%04d-%02d-%02d %02d:%02d:%02d UTC",
-		$tl[5]+1900, @tl[4,3,2,1,0]
-			|h %></strong>.
-%#	
 % }
 
 % if (!printable($m)) {
@@ -856,7 +857,7 @@ Generated by YARRG at <strong><%
 %	my $cdspan= $qa->{ShowStalls} ? ' colspan=2' : '';
 %	my $cdstall= $qa->{ShowStalls} ? '<th>Stall</th>' : '';
 <h2><a name="trades">Relevant trades</a></h2>
-<table id="trades" rules=groups>
+<table class="data" id="trades" rules=groups>
 <colgroup span=1>
 <colgroup span=2>
 <% $qa->{ShowStalls} ? '<colgroup span=2>' : '' %>
@@ -964,7 +965,7 @@ Generated by YARRG at <strong><%
 	throw => 'trades_sort', tbrow => 'trades_total' &>
   ts_sortkeys= <% to_json_protecttags(\%ts_sortkeys) %>;
 </&tabsort>
-
+<p>
 <input type=submit name=update value="Update">
 
 % } # !printable