chiark
/
gitweb
/
~yarrgweb
/
ypp-sc-tools.db-test.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
routesearch: Use correct island pair when eliminating!
[ypp-sc-tools.db-test.git]
/
yarrg
/
rsmain.c
diff --git
a/yarrg/rsmain.c
b/yarrg/rsmain.c
index 868d790411d4db5afd9457349f0f1a9b2d684103..ed21fe88e441cba93ce1c940b99a7fe5585166e5 100644
(file)
--- a/
yarrg/rsmain.c
+++ b/
yarrg/rsmain.c
@@
-28,10
+28,6
@@
int main(int argc, const char **argv) {
}
}
}
}
- setup_sql();
- setup_value();
- setup_search();
-
max_mass= atof(*argv++);
max_volu= atof(*argv++);
max_capi= atof(*argv++);
max_mass= atof(*argv++);
max_volu= atof(*argv++);
max_capi= atof(*argv++);
@@
-39,6
+35,10
@@
int main(int argc, const char **argv) {
if (!loss_per_league) loss_per_league= 1e-7;
distance_loss_factor_per_league= 1.0 - loss_per_league;
if (!loss_per_league) loss_per_league= 1e-7;
distance_loss_factor_per_league= 1.0 - loss_per_league;
+
+ setup_sql();
+ setup_value();
+ setup_search();
arg= *argv++;
if (!strcmp(arg,"specific")) {
arg= *argv++;
if (!strcmp(arg,"specific")) {
@@
-46,7
+46,7
@@
int main(int argc, const char **argv) {
while ((arg= *argv++))
ia[ni++]= atoi(arg);
while ((arg= *argv++))
ia[ni++]= atoi(arg);
- double val= value_route(ni, ia);
+ double val= value_route(ni, ia
, 0
);
printf("route value is %g\n", val);
} else if (!strcmp(arg,"search")) {
max_dist= atoi(*argv++);
printf("route value is %g\n", val);
} else if (!strcmp(arg,"search")) {
max_dist= atoi(*argv++);