173 |
|
FVECT vfrom; |
174 |
|
ovec_from_pos(vfrom, from_rbf->rbfa[i].gx, from_rbf->rbfa[i].gy); |
175 |
|
for (j = to_rbf->nrbf; j--; ) { |
176 |
< |
pricerow(pm,i)[j] = acos(DOT(vfrom, vto[j])) + |
176 |
> |
double dprod = DOT(vfrom, vto[j]); |
177 |
> |
pricerow(pm,i)[j] = ((dprod >= 1.) ? .0 : acos(dprod)) + |
178 |
|
fabs(R2ANG(to_rbf->rbfa[j].crad) - from_ang); |
179 |
|
psortrow(pm,i)[j] = j; |
180 |
|
} |
289 |
|
if (newmig->rbfv[1] == to_rbf) |
290 |
|
return(NULL); |
291 |
|
/* else allocate */ |
292 |
+ |
#ifdef DEBUG |
293 |
+ |
fprintf(stderr, "Building path from (theta,phi) (%.0f,%.0f) ", |
294 |
+ |
get_theta180(from_rbf->invec), |
295 |
+ |
get_phi360(from_rbf->invec)); |
296 |
+ |
fprintf(stderr, "to (%.0f,%.0f) with %d x %d matrix\n", |
297 |
+ |
get_theta180(to_rbf->invec), |
298 |
+ |
get_phi360(to_rbf->invec), |
299 |
+ |
from_rbf->nrbf, to_rbf->nrbf); |
300 |
+ |
#endif |
301 |
|
newmig = new_migration(from_rbf, to_rbf); |
302 |
|
if (run_subprocess()) |
303 |
|
return(newmig); /* child continues */ |
309 |
|
progname); |
310 |
|
exit(1); |
311 |
|
} |
302 |
– |
#ifdef DEBUG |
303 |
– |
fprintf(stderr, "Building path from (theta,phi) (%.0f,%.0f) ", |
304 |
– |
get_theta180(from_rbf->invec), |
305 |
– |
get_phi360(from_rbf->invec)); |
306 |
– |
fprintf(stderr, "to (%.0f,%.0f) with %d x %d matrix\n", |
307 |
– |
get_theta180(to_rbf->invec), |
308 |
– |
get_phi360(to_rbf->invec), |
309 |
– |
from_rbf->nrbf, to_rbf->nrbf); |
310 |
– |
#endif |
312 |
|
/* starting quantities */ |
313 |
|
memset(newmig->mtx, 0, sizeof(float)*from_rbf->nrbf*to_rbf->nrbf); |
314 |
|
for (i = from_rbf->nrbf; i--; ) |