X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2Fweb%2Froutetrade;h=e200aa5cfd78e7643297dfb350f73f2320b0b640;hb=3f99b04acd8cf6080069b542206f9f3de049f58a;hp=0edcca539afa87cc072e9abc6ab4dd6c86fedfc5;hpb=c2c600fb1b0bbe2627ac95e4dfe5e502780d986f;p=ypp-sc-tools.main.git

diff --git a/yarrg/web/routetrade b/yarrg/web/routetrade
index 0edcca5..e200aa5 100644
--- a/yarrg/web/routetrade
+++ b/yarrg/web/routetrade
@@ -162,14 +162,97 @@ push @columns,		     qw(commodname
 </pre>
 % }
 
-% {
 <& dumptable:start, qa => $qa, sth => $sth &>
-%   my $flow;
-%   while ($flow= $sth->fetchrow_hashref()) {
-%	$flow->{Ix}= @flows;
-%	$flow->{Var}= "f$flow->{Ix}";
-%	push @flows, $flow;
-<& dumptable:row, qa => $qa, sth => $sth, row => $flow &>
+% {
+%   my $f;
+%   while ($f= $sth->fetchrow_hashref()) {
+<%perl>
+
+	$f->{Ix}= @flows;
+	$f->{Var}= "f$f->{Ix}";
+
+	$f->{MaxQty}= $f->{'org_qty'} < $f->{'dst_qty'}
+		? $f->{'org_qty'} : $f->{'dst_qty'};
+	$f->{MaxProfit}= $f->{MaxQty} * $f->{'unitprofit'};
+	$f->{MaxCapital}= $f->{MaxQty} * $f->{'org_price'};
+
+	$f->{PctProfit}= sprintf "%3.1f%%",
+		$f->{'dst_price'} * 100.0 / $f->{'org_price'} - 100.0;
+
+	$f->{"org_stallid"}= $f->{"dst_stallid"}= 'all'
+		if !$qa->{ShowStalls};
+
+	my @uid= $f->{commodid};
+	foreach my $od (qw(org dst)) {
+		push @uid,
+			$f->{"${od}_id"},
+			$f->{"${od}_price"};
+		push @uid,
+			$f->{"${od}_stallid"}
+				if $qa->{ShowStalls};
+	}
+	$f->{UidLong}= join '_', @uid;
+
+	my $base= 31;
+	my $cmpu= '';
+	map {
+		my $uue= $_;
+		my $first= $base;
+		do {
+			my $this= $uue % $base;
+print STDERR "uue=$uue this=$this ";
+			$uue -= $this;
+			$uue /= $base;
+			$this += $first;
+			$first= 0;
+			$cmpu .= chr($this + ($this < 26 ? ord('a') :
+					      $this < 52 ? ord('A')-26
+							 : ord('0')-52));
+print STDERR " uue=$uue this=$this cmpu=$cmpu\n";
+die "$cmpu $uue ?" if length $cmpu > 20;
+		} while ($uue);
+		$cmpu;
+	} @uid;
+	$f->{UidShort}= $cmpu;
+
+	if ($qa->{'debug'}) {
+		my @outuid;
+		$_= $f->{UidShort};
+		my $mul;
+		while (m/./) {
+			my $v= m/^[a-z]/ ? ord($&)-ord('a') :
+			       m/^[A-Z]/ ? ord($&)-ord('A')+26 :
+			       m/^[0-9]/ ? ord($&)-ord('0')+52 :
+			       die "$_ ?";
+			if ($v >= $base) {
+				push @outuid, 0;
+				$v -= $base;
+				$mul= 1;
+#print STDERR "(next)\n";
+			}
+			die "$f->{UidShort} $_ ?" unless defined $mul;
+			$outuid[$#outuid] += $v * $mul;
+
+#print STDERR "$f->{UidShort}  $_  $&  v=$v  mul=$mul  ord()=".ord($&).
+#			"[vs.".ord('a').",".ord('A').",".ord('0')."]".
+#			"  outuid=@outuid\n";
+
+			$mul *= $base;
+			s/^.//;
+		}
+		my $recons_long= join '_', @outuid;
+		$f->{UidLong} eq $recons_long or
+			die "$f->{UidLong} = $f->{UidShort} = $recons_long ?";
+	}
+
+	if ($qa->{"R$f->{UidShort}"} && !$qa->{"T$f->{UidShort}"}) {
+		$f->{Suppress}= 1;
+	}
+
+	push @flows, $f;
+
+</%perl>
+<& dumptable:row, qa => $qa, sth => $sth, row => $f &>
 %   }
 <& dumptable:end, qa => $qa &>
 % }
@@ -198,20 +281,29 @@ Maximize
 
   totalprofit:
                   ".(join " +
-                  ", map { "$_->{unit_profit} $_->{Var}" } @flows)."
+                  ", map { "$_->{unitprofit} $_->{Var}" } @flows)."
 
 Subject To
 ";
 
 my %avail_csts;
 foreach my $flow (@flows) {
+	if ($flow->{Suppress}) {
+		$cplex .= "
+   $flow->{Var} = 0
+";
+		next;
+	}
 	foreach my $od (qw(org dst)) {
-		my $cstname= join '_',
+		my $cstname= join '_', (
 			'avail',
 			$flow->{'commodid'},
 			$od,
 			$flow->{"${od}_id"},
-			$flow->{"${od}_price"};
+			$flow->{"${od}_price"},
+			$flow->{"${od}_stallid"},
+		);
+			
 		push @{ $avail_csts{$cstname}{Flows} }, $flow->{Var};
 		$avail_csts{$cstname}{Qty}= $flow->{"${od}_qty"};
 	}
@@ -272,8 +364,6 @@ if ($qa->{'debug'}) {
 	die unless $found_section;
 };
 
-print join ' ', map { $_->{Optimal} } @flows;
-
 push @columns, qw(OptQty OptCapital OptProfit);
 
 </%perl>
@@ -285,6 +375,7 @@ push @columns, qw(OptQty OptCapital OptProfit);
 %	my $cdstall= $qa->{ShowStalls} ? '<th>Stall</th>' : '';
 <table>
 <tr>
+<th>
 <th<% $cdspan %>>Collect
 <th<% $cdspan %>>Deliver
 <th>
@@ -297,6 +388,7 @@ push @columns, qw(OptQty OptCapital OptProfit);
 %	}
 
 <tr>
+<th>
 <th>Island <% $cdstall %>
 <th>Island <% $cdstall %>
 <th>Commodity
@@ -318,19 +410,17 @@ push @columns, qw(OptQty OptCapital OptProfit);
 
 % foreach my $flow (@flows) {
 <tr>
+<td><input type=hidden   name=R<% $flow->{UidShort} %> value="">
+    <input type=checkbox name=T<% $flow->{UidShort} %> value=""
+       <% $flow->{Suppress} ? '' : 'checked' %> >
 %	foreach my $col (@columns) {
-%		$flow->{MaxQty}= $flow->{'org_qty'} < $flow->{'dst_qty'}
-%			? $flow->{'org_qty'} : $flow->{'dst_qty'};
-%		$flow->{MaxProfit}= $flow->{MaxQty} * $flow->{'unitprofit'};
-%		$flow->{PctProfit}= sprintf "%3.1f%%",
-%			$flow->{'dst_price'} * 100.0 / $flow->{'org_price'}
-%			- 100.0;
-%		$flow->{MaxCapital}= $flow->{MaxQty} * $flow->{'org_price'};
 <td><% $flow->{$col} |h %>
 %	}
 % }
 </table>
 
+<input type=submit name=update value="Update">
+
 <%init>
 use CommodsWeb;
 use Commods;