X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2Fweb%2Froutetrade;h=9660094532aa1544fb5db23092546991c098ee75;hb=c98eb3b0720f8194a116aea338fd2d3caa8c7538;hp=09e908b1ac44e160fb817dacb612a8c746e19b67;hpb=c444da554d8b434492399eaf81574c081dad7141;p=ypp-sc-tools.main.git diff --git a/yarrg/web/routetrade b/yarrg/web/routetrade index 09e908b..9660094 100644 --- a/yarrg/web/routetrade +++ b/yarrg/web/routetrade @@ -140,6 +140,9 @@ my $stmt= " commods.commodid commodid, commods.unitmass unitmass, commods.unitvolume unitvolume, + commods.ordval ordval, + commods.posinclass posinclass, + commods.commodclassid commodclassid, dist dist, buy.price - sell.price unitprofit FROM commods @@ -407,11 +410,17 @@ Maximize totalprofit: "; +my %stall_poe_limits; + foreach my $sf (@subflows) { my $eup= $sf->{Flow}{ExpectedUnitProfit}; $eup *= (1.0-$loss_per_delay_slot) ** $sf->{Org}; $cplex .= sprintf " %+.20f %s", $eup, $sf->{Var}; + if ($qa->{ShowStalls}>=2) { + my $stall= $sf->{Flow}{'dst_stallid'}; + push @{ $stall_poe_limits{$stall} }, $sf; + } } $cplex .= " @@ -485,6 +494,24 @@ foreach my $ci (0..($#islandids-1)) { $cplex.= "\n"; } +if ($qa->{ShowStalls}>=2) { + my $stallpoe= $dbh->prepare(< $b } keys %stall_poe_limits) { + $stallpoe->execute($stallid); + my ($lim)= $stallpoe->fetchrow_array(); + $stallpoe->finish(); + $cplex.= " + ". sprintf("%-15s","poe_$stallid:")." ". + join(" + ", map { + sprintf "%d %s", $_->{Flow}{'dst_price'}, $_->{Var}; + } @{ $stall_poe_limits{$stallid} }). + " <= $lim"; + } + $cplex.= "\n"; +} + $cplex.= " Bounds ".(join " @@ -512,7 +539,7 @@ if ($qa->{'debug'}) { my $input= pipethrough_prep(); print $input $cplex or die $!; my $output= pipethrough_run_along($input, undef, 'glpsol', - qw(glpsol --tmlim 2 --memlim 5 --intopt --cuts --bfs + qw(glpsol --tmlim 5 --memlim 5 --intopt --cuts --bfs --cpxlp /dev/stdin -o /dev/stdout)); print "
\n" if $qa->{'debug'};
 	my $found_section= 0;
@@ -546,7 +573,7 @@ if ($qa->{'debug'}) {
 		my ($varname, $qty) = m/^
 			\s* \d+ \s+
 			(\w+) \s+ (?: [A-Z*]+ \s+ )?
-			([0-9.]+) \s
+			([+-e0-9.]+) \s
 			/x or die "$cplex \n==\n $glpsol_out $_ ?";
 		if ($varname =~ m/^f(\d+)s(\d+)_/) {
 			my ($ix,$orgix) = ($1,$2);
@@ -625,7 +652,7 @@ Generated by YARRG at <%
 %
 
Voyage trading plan

 
- >
+
 >
 % my $tbody= sub {
 %	if (!printable($m)) { return ''; }
 %#  return "
 %	$iquery->execute($islandids[$i]);
 %	my ($islandname) = $iquery->fetchrow_array();
 %	if (!$i) {
+
-' : '';
 
Relevant trades

-
";
@@ -635,14 +662,18 @@ Generated by YARRG at <%
 %
 % foreach my $i (0..$#islandids) {
 <% $tbody->(1) %>
-

+

 Start at <% $islandname |h %>
+[what are these codes?]
+
 %	} else {
 %		my $this_dist= $distance->($islandids[$i-1],$islandids[$i]);
 %		$total_dist += $this_dist;
+
 <%perl>
 		my $total_value= 0;
 		foreach my $sf (@subflows) {
@@ -659,7 +690,7 @@ Generated by YARRG at <%
 <%perl>
      my $age_reported= 0;
      my %flowlists;
-     #print "
" if $qa->{'debug'};
+     #print "
" if $qa->{'debug'};
      foreach my $od (qw(org dst)) {
 	#print " [[ i $i od $od " if $qa->{'debug'};
 	foreach my $sf (@subflows) {
@@ -673,6 +704,7 @@ Generated by YARRG at <%
 		my $price= $f->{"${od}_price"};
 		my $stallname= $f->{"${od}_stallname"};
 		my $todo= \$flowlists{$od}{
+				(sprintf "%010d", $f->{'ordval'}),
 				$f->{'commodname'},
 				(sprintf "%07d", ($od eq 'dst' ?
 						9999999-$price : $price)),
@@ -684,6 +716,33 @@ Generated by YARRG at <%
 			dstArbitrage => 0,
 		} unless $$todo;
 		$$todo->{'commodname'}= $f->{'commodname'};
+		$$todo->{'posinclass'}= '';
+		my $incl= $f->{'posinclass'};
+
+		my $findclass= $dbh->prepare(<execute($f->{'commodclassid'});
+		my $classinfo= $findclass->fetchrow_hashref();
+		if ($classinfo) {
+			my $clname= $classinfo->{'commodclass'};
+			my $desc= encode_entities(sprintf "%s is under %s",
+					$f->{'commodname'}, $clname);
+			my $abbrev= substr($clname,0,1);
+			if ($incl) {
+				my $maxpic= $classinfo->{'maxposinclass'};
+				$desc.= (sprintf ", commodity %d of %d",
+					$incl, $maxpic);
+				if ($classinfo->{'maxposinclass'} >= 8) {
+					my @tmbs= qw(0 1 2 3 4 5 6 7 8 9);
+					my $tmbi= ($incl+0.5)*$#tmbs/$maxpic;
+					$abbrev.= " ".$tmbs[$tmbi]." ";
+				}
+			}
+			$$todo->{'posinclass'}=
+				"
"
+				.$abbrev."
";
+		}
 		$$todo->{'stallname'}= $stallname;
 		$$todo->{Price}= $price;
 		$$todo->{Timestamp}= $f->{"${od}_timestamp"};
@@ -715,7 +774,7 @@ Generated by YARRG at <%
 
 

 
-<% $xinfo %>
+<% $xinfo %>
 <% $totaldesc %>
 <% $totalwas |h %> total
 <%perl>
@@ -746,6 +805,7 @@ Generated by YARRG at <%
 % tr_datarow($m,$dline);
 <<% $td %>><% $collectdeliver %>
 <<% $td %>><% $t->{'commodname'} |h %>
+<<% $td %>><% $t->{'posinclass'} %>
 %
 %		my @stalls= sort keys %{ $t->{Stalls} };
 %		my $pstall= sub {
@@ -792,7 +852,7 @@ Generated by YARRG at <%
 }
 
 <% $tbody->(1) %>
Total distance: <% $total_dist %> leagues.
+Total distance: <% $total_dist %> leagues.
 Overall net cash flow
 <%
   $total_total < 0 ? -$total_total." loss" : $total_total." gain"
@@ -857,7 +917,7 @@ Islands shown in reverse order of visits.

 %	my $cdspan= $qa->{ShowStalls} ? ' colspan=2' : '';
 %	my $cdstall= $qa->{ShowStalls} ? '		Stall

+
<% $qa->{ShowStalls} ? '' : '' %>
@@ -965,7 +1025,7 @@ Islands shown in reverse order of visits.

 	throw => 'trades_sort', tbrow => 'trades_total' &>
   ts_sortkeys= <% to_json_protecttags(\%ts_sortkeys) %>;
 
-
+

 
 
 % } # !printable