const char *arg;
int i, ap;
int granui;
+ const char *database=0;
#ifndef debug_flags
debug_flags= ~( dbg_sql2 );
for (;;) {
arg= *++argv;
if (arg[0] != '-') break;
+ if (!strcmp(arg,"-d")) {
+ database= *++argv;
+ } else if (!strcmp(arg,"-g")) {
+ granus= atoi(*++argv);
+ assert(granus>=1 && granus<=GRANUS);
#ifndef debug_flags
- if (!strcmp(arg,"-DN")) {
+ } else if (!strcmp(arg,"-DN")) {
debug_flags= 0;
} else if (!strcmp(arg,"-D1")) {
debug_flags= ~(dbg_sql2|dbg_lp|dbg_value2);
- } else
+ } else {
#endif
- {
abort();
}
}
debug_file= stderr;
}
- const char *database= *argv++;
-
sysassert( !setvbuf(debug,0,_IOLBF,0) );
max_mass= atof(*argv++);
my $routeparams= { EmsgRef => \$emsg, SayRequiredCapacity => 1 };
my $maxdist;
my $maxcountea=10;
+my $maxcpu=10;
</%perl>
#---------- compute the results ----------
-my @rsargs;
+my @rsargs= qw(-DN);
foreach my $k (qw(MaxMass MaxVolume MaxCapital)) {
my $v= $routeparams->{$k};
}
push @rsargs, defined $routeparams->{LossPerLeaguePct}
? $routeparams->{LossPerLeaguePct}*0.01 : 1e-9;
-push @rsargs, 'search', $maxcountea,$maxcountea, $maxdist, 'any', @islandids;
+push @rsargs, 'search',$maxdist, $maxcountea,$maxcountea, 'any', @islandids;
m/[^-.0-9a-zA-Z]/ and die "$_ $& ?" foreach @rsargs;
-unshift @rsargs, dbw_filename($qa->{'Ocean'});
-unshift @rsargs, qw(-DN);
-
if ($qa->{'debug'}) {
</%perl>
[[ <% "@rsargs" |h %> ]]<br><pre>
<%perl>
}
-unshift @rsargs, sourcebasedir().'/yarrg/routesearch';
+unshift @rsargs, sourcebasedir().'/yarrg/routesearch',
+ '-d', dbw_filename($qa->{'Ocean'});
my %results; # $results{$ap}{"5 6 9 10"} = { stuff }
if (!$child) {
my $cpu= BSD::Resource::RLIMIT_CPU;
my ($soft,$hard)= getrlimit($cpu);
- my $max=10;
- setrlimit($cpu,$max,$hard) or die $! if $soft>$max;
+ setrlimit($cpu,$maxcpu,$hard) or die $! if $soft>$maxcpu;
exec @rsargs;
die $!;
}
<td align=right><% $item->{A} |h %>
<td align=right><% $item->{P} |h %>
<td align=left><% join ', ', @{ $item->{Archs} } |h %>
-<td align=left><% $item->{Start} |h %>,
+<td align=left><% $item->{Start} |h %>,
<td align=left><% join ' ', map { $_.',' } @{ $item->{Vias} } |h %>
<td align=left><% $item->{Finish} |h %>
</td>