* subtract a fudge factor from our target.
*/
double near_best = best * 0.98 - 0.02;
- n_max_frags = ceil(n / near_best) - 1;
- m_max_frags = ceil(m / near_best) - 1;
+ if (near_best > 0) {
+ n_max_frags = ceil(n / near_best) - 1;
+ m_max_frags = ceil(m / near_best) - 1;
+ }
}
/*----- multicore support -----*/
if (adjmatrix[i] & jbit)
weight[j]++;
for (int j = 0; j < m; j++)
- if (weight[j] >= n_max_frags)
+ if (weight[j] > n_max_frags)
goto takeout;
iterate_recurse(i+1, adjmatrix[i]);
continue;
a[x][y] = min + glp_get_col_prim(best_prob, i);
}
- printf("min fragment %g", min);
+ printf("min fragment %g [%s]\n", min, VERSION);
for (i = 0; i < n; i++) {
for (j = 0; j < m; j++) {
if (a[i][j])
printf("\n");
}
} else {
- printf(" none better than %9.3f ", best);
+ printf(" none better than %9.3f [%s]\n", best, VERSION);
}
- printf(" [%s]\n", VERSION);
if (ferror(stdout) || fclose(stdout)) { perror("stdout"); exit(-1); }
}
int main(int argc, char **argv) {
int opt;
+ double best_to_set = -1.0; /* means 'don't' */
while ((opt = getopt(argc,argv,"j:b:")) >= 0) {
switch (opt) {
case 'j': ncpus = atoi(optarg); break;
- case 'b': set_best(atof(optarg)); break;
+ case 'b': best_to_set = atof(optarg); break;
case '+': assert(!"bad option");
default: abort();
}
n = atoi(argv[1]);
m = atoi(argv[2]);
assert(n > m);
+ if (best_to_set > 0) set_best(best_to_set);
prep();