X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2Fweb%2Froutetrade;h=ce91b48726c40f4a59da3f5d8ad40f2204fb1e12;hb=f0c6aae5a301ba3236debfe2588a55ae3f8481c6;hp=07789cf412564330fbfcd3d3606d30077c28b20b;hpb=492ee8e5d023945e2768e9568f22bd63a19b59f4;p=ypp-sc-tools.main.git

diff --git a/yarrg/web/routetrade b/yarrg/web/routetrade
index 07789cf..ce91b48 100644
--- a/yarrg/web/routetrade
+++ b/yarrg/web/routetrade
@@ -32,26 +32,6 @@
  This Mason component is the core trade planner for a specific route.
 
 
-========== TODO ==========
-16:36 <ceb> alpha,byrne,papaya,turtle,jorvik,luthien is my example
-xi,heph for mixed arbitrage/trade
-
-initial/final stocks feature
-
-display net cash flow
-
-onload thing broken, need proper framework
-
-use POST for update.  Hrrm.
-
-LATER OR NOT AT ALL
-
-adjustable potential cost of losses (rather than fixed 1e-BIG per league)
-
-max volume/mass
-
-========== TODO ==========
-
 </%doc>
 <%args>
 $dbh
@@ -105,10 +85,12 @@ foreach my $src_i (0..$#islandids) {
 
 		if ($specific && !$confusing &&
 		    # With a circular route, do not carry goods round the loop
-		    !($src_i==0 && $dst_i==$#islandids &&
+		    !(($src_i==0 || $src_i==$#islandids) &&
+		      $dst_i==$#islandids &&
 		      $src_isle == $islandids[$dst_i])) {
 			if ($islandpair{$src_isle,$dst_isle}) {
 				$confusing= 1;
+print "confusing $src_i $src_isle  $dst_i $dst_isle\n";
 			} else {
 				$islandpair{$src_isle,$dst_isle}=
 					[ $src_i, $dst_i ];
@@ -259,6 +241,12 @@ $addcols->({ DoReverse => 1 },
 % }
 
 <%perl>
+
+if (!@flows) {
+	print 'No profitable trading opportunities were found.';
+	return;
+}
+
 foreach my $f (@flows) {
 
 	$f->{MaxQty}= $f->{'org_qty_agg'} < $f->{'dst_qty_agg'}
@@ -360,7 +348,7 @@ Route contains archipelago(es), not just specific islands.
 Route is complex - it visits the same island several times
 and isn't a simple loop.
 % }
-Therefore, optimal trade pattern not calculated.
+Therefore, optimal voyage trade plan not calculated.
 
 % } else { # ========== OPTMISATION ==========
 <%perl>
@@ -430,7 +418,9 @@ if ($qa->{'debug'}) {
 		qw(glpsol --cpxlp /dev/stdin -o /dev/stdout));
 	print "<pre>\n" if $qa->{'debug'};
 	my $found_section= 0;
+	my $glpsol_out= '';
 	while (<$output>) {
+		$glpsol_out.= $_;
 		print encode_entities($_) if $qa->{'debug'};
 		if (m/^\s*No\.\s+Column name\s+St\s+Activity\s/) {
 			die if $found_section>0;
@@ -451,8 +441,9 @@ if ($qa->{'debug'}) {
 		$flow->{OptCapital}= $flow->{OptQty} * $flow->{'org_price'};
 	}
 	print "</pre>\n" if $qa->{'debug'};
-	pipethrough_run_finish($output, 'glpsol');
-	die unless $found_section;
+	my $prerr= "\n=====\n$cplex\n=====\n$glpsol_out\n=====\n ";
+	pipethrough_run_finish($output,$prerr);
+	die $prerr unless $found_section;
 };
 
 $addcols->({ DoReverse => 1 }, qw(
@@ -551,15 +542,10 @@ $addcols->({ Total => 0, DoReverse => 1 }, qw(
 % }
 </table>
 
-<& tabsort, cols => \@cols, table => 'trades', rowclass => 'datarow',
+<&| tabsort, cols => \@cols, table => 'trades', rowclass => 'datarow',
 	throw => 'trades_sort', tbrow => 'trades_total' &>
-<&| script &>
   ts_sortkeys= <% to_json_protecttags(\%ts_sortkeys) %>;
-  function all_onload() {
-    ts_onload__trades();
-  }
-  window.onload= all_onload;
-</&script>
+</&tabsort>
 
 <input type=submit name=update value="Update">
 
@@ -568,6 +554,7 @@ $addcols->({ Total => 0, DoReverse => 1 }, qw(
 % my $iquery= $dbh->prepare('SELECT islandname FROM islands
 %				WHERE islandid = ?');
 % my %da_ages;
+% my $total_total= 0;
 %
 <h1>Voyage trading plan</h1>
 <table rules=groups>
@@ -590,6 +577,11 @@ Sail to <% $islandname |h %>
 		next if $f->{Suppress};
 		next unless $f->{"${od}_id"} == $islandids[$i];
 		next unless $f->{OptQty};
+		my $arbitrage= $f->{'org_id'} == $f->{'dst_id'};
+		my $loop= $islandids[0] == $islandids[-1] &&
+			  ($i==0 || $i==$#islandids);
+		next if $loop and ($arbitrage ? $i :
+			!!$i == !!($od eq 'org'));
 		my $price= $f->{"${od}_price"};
 		my $stallname= $f->{"${od}_stallname"};
 		my $todo= \$flowlists{$od}{
@@ -610,9 +602,7 @@ Sail to <% $islandname |h %>
 		$$todo->{Qty} += $f->{OptQty};
 		$$todo->{Total}= $$todo->{Price} * $$todo->{Qty};
 		$$todo->{Stalls}= $f->{"${od}Stalls"};
-		if ($f->{'org_id'} == $f->{'dst_id'}) {
-			$$todo->{"${od}Arbitrage"}= 1;
-		}
+		$$todo->{"${od}Arbitrage"}= 1 if $arbitrage;
 	}
      }
 
@@ -664,25 +654,32 @@ Sail to <% $islandname |h %>
 %	}
 %    };
 %    my $show_total= sub {
-%	my ($totaldesc)= @_;
+%	my ($totaldesc, $sign)= @_;
 %	if (defined $total) {
 <tr>
 <td colspan=3>
 <td colspan=2 align=right><% $totaldesc %>
 <td align=right><% $total |h %> total
+%		$total_total += $sign * $total;
 %	}
 %	$total= undef;
 %	$dline= 0;
 <%perl>
      };
 
-     $show_flows->('dst',0,'Deliver');  $show_total->('Proceeds');
-     $show_flows->('org',1,'Collect');  $show_total->('(Arbitrage) outlay');
-     $show_flows->('dst',1,'Deliver');  $show_total->('(Arbitrage) proceeds');
-     $show_flows->('org',0,'Collect');  $show_total->('Outlay');
+     $show_flows->('dst',0,'Deliver'); $show_total->('Proceeds',1);
+     $show_flows->('org',1,'Collect'); $show_total->('(Arbitrage) outlay',-1);
+     $show_flows->('dst',1,'Deliver'); $show_total->('(Arbitrage) proceeds',1);
+     $show_flows->('org',0,'Collect'); $show_total->('Outlay',-1);
 
 }
 </%perl>
+<tbody><tr>
+<td colspan=2>
+<td colspan=3 align=right>Overall net cash flow
+<td align=right><strong><%
+  $total_total < 0 ? -$total_total." loss" : $total_total." gain"
+ %></strong>
 </table>
 <& query_age:dataages, id2age => \%da_ages &>
 %