| 27 |
|
int nrows, ncols; /* array size (matches migration) */ |
| 28 |
|
float *price; /* migration prices */ |
| 29 |
|
short *sord; /* sort for each row, low to high */ |
| 30 |
+ |
float *prow; /* current price row */ |
| 31 |
|
} PRICEMAT; /* sorted pricing matrix */ |
| 32 |
|
|
| 33 |
|
#define pricerow(p,i) ((p)->price + (i)*(p)->ncols) |
| 140 |
|
msrt_cmp(void *b, const void *p1, const void *p2) |
| 141 |
|
{ |
| 142 |
|
PRICEMAT *pm = (PRICEMAT *)b; |
| 143 |
< |
int ri = ((const short *)p1 - pm->sord) / pm->ncols; |
| 144 |
< |
float c1 = pricerow(pm,ri)[*(const short *)p1]; |
| 144 |
< |
float c2 = pricerow(pm,ri)[*(const short *)p2]; |
| 143 |
> |
float c1 = pm->prow[*(const short *)p1]; |
| 144 |
> |
float c2 = pm->prow[*(const short *)p2]; |
| 145 |
|
|
| 146 |
|
if (c1 > c2) return(1); |
| 147 |
|
if (c1 < c2) return(-1); |
| 171 |
|
for (i = from_rbf->nrbf; i--; ) { |
| 172 |
|
const double from_ang = R2ANG(from_rbf->rbfa[i].crad); |
| 173 |
|
FVECT vfrom; |
| 174 |
+ |
short *srow; |
| 175 |
|
ovec_from_pos(vfrom, from_rbf->rbfa[i].gx, from_rbf->rbfa[i].gy); |
| 176 |
+ |
pm->prow = pricerow(pm,i); |
| 177 |
+ |
srow = psortrow(pm,i); |
| 178 |
|
for (j = to_rbf->nrbf; j--; ) { |
| 179 |
< |
pricerow(pm,i)[j] = acos(DOT(vfrom, vto[j])) + |
| 179 |
> |
double dprod = DOT(vfrom, vto[j]); |
| 180 |
> |
pm->prow[j] = ((dprod >= 1.) ? .0 : acos(dprod)) + |
| 181 |
|
fabs(R2ANG(to_rbf->rbfa[j].crad) - from_ang); |
| 182 |
< |
psortrow(pm,i)[j] = j; |
| 182 |
> |
srow[j] = j; |
| 183 |
|
} |
| 184 |
< |
qsort_r(psortrow(pm,i), pm->ncols, sizeof(short), pm, &msrt_cmp); |
| 184 |
> |
qsort_r(srow, pm->ncols, sizeof(short), pm, &msrt_cmp); |
| 185 |
|
} |
| 186 |
|
free(vto); |
| 187 |
|
} |
| 292 |
|
if (newmig->rbfv[1] == to_rbf) |
| 293 |
|
return(NULL); |
| 294 |
|
/* else allocate */ |
| 295 |
+ |
#ifdef DEBUG |
| 296 |
+ |
fprintf(stderr, "Building path from (theta,phi) (%.0f,%.0f) ", |
| 297 |
+ |
get_theta180(from_rbf->invec), |
| 298 |
+ |
get_phi360(from_rbf->invec)); |
| 299 |
+ |
fprintf(stderr, "to (%.0f,%.0f) with %d x %d matrix\n", |
| 300 |
+ |
get_theta180(to_rbf->invec), |
| 301 |
+ |
get_phi360(to_rbf->invec), |
| 302 |
+ |
from_rbf->nrbf, to_rbf->nrbf); |
| 303 |
+ |
#endif |
| 304 |
|
newmig = new_migration(from_rbf, to_rbf); |
| 305 |
|
if (run_subprocess()) |
| 306 |
|
return(newmig); /* child continues */ |
| 312 |
|
progname); |
| 313 |
|
exit(1); |
| 314 |
|
} |
| 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 |
| 315 |
|
/* starting quantities */ |
| 316 |
|
memset(newmig->mtx, 0, sizeof(float)*from_rbf->nrbf*to_rbf->nrbf); |
| 317 |
|
for (i = from_rbf->nrbf; i--; ) |
