chiark
/
gitweb
/
~yarrgweb
/
ypp-sc-tools.db-live.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ../ypp-sc-tools
[ypp-sc-tools.db-live.git]
/
yarrg
/
web
/
routetrade
diff --git
a/yarrg/web/routetrade
b/yarrg/web/routetrade
index ee1141a3965c73d2672c81ff9c93cd3f4bb0bb00..383d55481b93bc34bf24f06bf58e19730722bc56 100644
(file)
--- a/
yarrg/web/routetrade
+++ b/
yarrg/web/routetrade
@@
-506,7
+506,8
@@
if ($qa->{'debug'}) {
my $input= pipethrough_prep();
print $input $cplex or die $!;
my $output= pipethrough_run_along($input, undef, 'glpsol',
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= '';
print "<pre>\n" if $qa->{'debug'};
my $found_section= 0;
my $glpsol_out= '';
@@
-844,7
+845,7
@@
$addcols->({ Total => 0, DoReverse => 1, TotalSubflows => 1 }, qw(
$show_flows->('org',0,'Collect'); $show_total->('Outlay',-1);
my $totals= '';
if ($i < $#islandids) {
$show_flows->('org',0,'Collect'); $show_total->('Outlay',-1);
my $totals= '';
if ($i < $#islandids) {
- $totals .= "
Hold:
$sail_total[$i]{mass}kg,".
+ $totals .= "
In hold
$sail_total[$i]{mass}kg,".
" $sail_total[$i]{volume} l";
my $delim= '; spare ';
my $domv= sub {
" $sail_total[$i]{volume} l";
my $delim= '; spare ';
my $domv= sub {