| 176 |
|
pm->prow = pricerow(pm,i); |
| 177 |
|
srow = psortrow(pm,i); |
| 178 |
|
for (j = to_rbf->nrbf; 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); |
| 179 |
> |
double d; /* quadratic cost function */ |
| 180 |
> |
d = Acos(DOT(vfrom, vto[j])); |
| 181 |
> |
pm->prow[j] = d*d; |
| 182 |
> |
d = R2ANG(to_rbf->rbfa[j].crad) - from_ang; |
| 183 |
> |
pm->prow[j] += d*d; |
| 184 |
|
srow[j] = j; |
| 185 |
|
} |
| 186 |
|
qsort_r(srow, pm->ncols, sizeof(short), pm, &msrt_cmp); |
| 200 |
|
static double |
| 201 |
|
min_cost(double amt2move, const double *avail, const PRICEMAT *pm, int s) |
| 202 |
|
{ |
| 203 |
+ |
const short *srow = psortrow(pm,s); |
| 204 |
+ |
const float *prow = pricerow(pm,s); |
| 205 |
|
double total_cost = 0; |
| 206 |
|
int j; |
| 203 |
– |
|
| 204 |
– |
if (amt2move <= FTINY) /* pre-emptive check */ |
| 205 |
– |
return(.0); |
| 207 |
|
/* move cheapest first */ |
| 208 |
< |
for (j = 0; j < pm->ncols && amt2move > FTINY; j++) { |
| 209 |
< |
int d = psortrow(pm,s)[j]; |
| 208 |
> |
for (j = 0; (j < pm->ncols) & (amt2move > FTINY); j++) { |
| 209 |
> |
int d = srow[j]; |
| 210 |
|
double amt = (amt2move < avail[d]) ? amt2move : avail[d]; |
| 211 |
|
|
| 212 |
< |
total_cost += amt * pricerow(pm,s)[d]; |
| 212 |
> |
total_cost += amt * prow[d]; |
| 213 |
|
amt2move -= amt; |
| 214 |
|
} |
| 215 |
|
return(total_cost); |
| 216 |
|
} |
| 217 |
|
|
| 218 |
< |
/* Take a step in migration by choosing optimal bucket to transfer */ |
| 218 |
> |
typedef struct { |
| 219 |
> |
short s, d; /* source and destination */ |
| 220 |
> |
float dc; /* discount to push inventory */ |
| 221 |
> |
} ROWSENT; /* row sort entry */ |
| 222 |
> |
|
| 223 |
> |
/* Compare entries by discounted moving price */ |
| 224 |
> |
static int |
| 225 |
> |
rmovcmp(void *b, const void *p1, const void *p2) |
| 226 |
> |
{ |
| 227 |
> |
PRICEMAT *pm = (PRICEMAT *)b; |
| 228 |
> |
const ROWSENT *re1 = (const ROWSENT *)p1; |
| 229 |
> |
const ROWSENT *re2 = (const ROWSENT *)p2; |
| 230 |
> |
double price_diff; |
| 231 |
> |
|
| 232 |
> |
if (re1->d < 0) return(re2->d >= 0); |
| 233 |
> |
if (re2->d < 0) return(-1); |
| 234 |
> |
price_diff = re1->dc*pricerow(pm,re1->s)[re1->d] - |
| 235 |
> |
re2->dc*pricerow(pm,re2->s)[re2->d]; |
| 236 |
> |
if (price_diff > 0) return(1); |
| 237 |
> |
if (price_diff < 0) return(-1); |
| 238 |
> |
return(0); |
| 239 |
> |
} |
| 240 |
> |
|
| 241 |
> |
/* Take a step in migration by choosing reasonable bucket to transfer */ |
| 242 |
|
static double |
| 243 |
< |
migration_step(MIGRATION *mig, double *src_rem, double *dst_rem, const PRICEMAT *pm) |
| 243 |
> |
migration_step(MIGRATION *mig, double *src_rem, double *dst_rem, PRICEMAT *pm) |
| 244 |
|
{ |
| 245 |
+ |
const int max2check = 100; |
| 246 |
|
const double maxamt = 1./(double)pm->ncols; |
| 247 |
< |
const double minamt = maxamt*5e-6; |
| 247 |
> |
const double minamt = maxamt*1e-4; |
| 248 |
|
double *src_cost; |
| 249 |
+ |
ROWSENT *rord; |
| 250 |
|
struct { |
| 251 |
|
int s, d; /* source and destination */ |
| 252 |
< |
double price; /* price estimate per amount moved */ |
| 252 |
> |
double price; /* cost per amount moved */ |
| 253 |
|
double amt; /* amount we can move */ |
| 254 |
|
} cur, best; |
| 255 |
< |
int i; |
| 255 |
> |
int r2check, i, ri; |
| 256 |
> |
/* |
| 257 |
> |
* Check cheapest available routes only -- a higher adjusted |
| 258 |
> |
* destination price implies that another source is closer, so |
| 259 |
> |
* we can hold off considering more expensive options until |
| 260 |
> |
* some other (hopefully better) moves have been made. |
| 261 |
> |
* A discount based on source remaining is supposed to prioritize |
| 262 |
> |
* movement from large lobes, but it doesn't seem to do much, |
| 263 |
> |
* so we have it set to 1.0 at the moment. |
| 264 |
> |
*/ |
| 265 |
> |
#define discount(qr) 1.0 |
| 266 |
> |
/* most promising row order */ |
| 267 |
> |
rord = (ROWSENT *)malloc(sizeof(ROWSENT)*pm->nrows); |
| 268 |
> |
if (rord == NULL) |
| 269 |
> |
goto memerr; |
| 270 |
> |
for (ri = pm->nrows; ri--; ) { |
| 271 |
> |
rord[ri].s = ri; |
| 272 |
> |
rord[ri].d = -1; |
| 273 |
> |
rord[ri].dc = 1.f; |
| 274 |
> |
if (src_rem[ri] <= minamt) /* enough source material? */ |
| 275 |
> |
continue; |
| 276 |
> |
for (i = 0; i < pm->ncols; i++) |
| 277 |
> |
if (dst_rem[ rord[ri].d = psortrow(pm,ri)[i] ] > minamt) |
| 278 |
> |
break; |
| 279 |
> |
if (i >= pm->ncols) { /* moved all we can? */ |
| 280 |
> |
free(rord); |
| 281 |
> |
return(.0); |
| 282 |
> |
} |
| 283 |
> |
rord[ri].dc = discount(src_rem[ri]); |
| 284 |
> |
} |
| 285 |
> |
if (pm->nrows > max2check) /* sort if too many sources */ |
| 286 |
> |
qsort_r(rord, pm->nrows, sizeof(ROWSENT), pm, &rmovcmp); |
| 287 |
|
/* allocate cost array */ |
| 288 |
|
src_cost = (double *)malloc(sizeof(double)*pm->nrows); |
| 289 |
< |
if (src_cost == NULL) { |
| 290 |
< |
fprintf(stderr, "%s: Out of memory in migration_step()\n", |
| 234 |
< |
progname); |
| 235 |
< |
exit(1); |
| 236 |
< |
} |
| 289 |
> |
if (src_cost == NULL) |
| 290 |
> |
goto memerr; |
| 291 |
|
for (i = pm->nrows; i--; ) /* starting costs for diff. */ |
| 292 |
|
src_cost[i] = min_cost(src_rem[i], dst_rem, pm, i); |
| 239 |
– |
|
| 293 |
|
/* find best source & dest. */ |
| 294 |
|
best.s = best.d = -1; best.price = FHUGE; best.amt = 0; |
| 295 |
< |
for (cur.s = pm->nrows; cur.s--; ) { |
| 295 |
> |
if ((r2check = pm->nrows) > max2check) |
| 296 |
> |
r2check = max2check; /* put a limit on search */ |
| 297 |
> |
for (ri = 0; ri < r2check; ri++) { /* check each source row */ |
| 298 |
|
double cost_others = 0; |
| 299 |
< |
|
| 300 |
< |
if (src_rem[cur.s] <= minamt) |
| 301 |
< |
continue; |
| 302 |
< |
/* examine cheapest dest. */ |
| 303 |
< |
for (i = 0; i < pm->ncols; i++) |
| 304 |
< |
if (dst_rem[ cur.d = psortrow(pm,cur.s)[i] ] > minamt) |
| 250 |
< |
break; |
| 251 |
< |
if (i >= pm->ncols) |
| 252 |
< |
break; |
| 253 |
< |
if ((cur.price = pricerow(pm,cur.s)[cur.d]) >= best.price) |
| 254 |
< |
continue; /* no point checking further */ |
| 299 |
> |
cur.s = rord[ri].s; |
| 300 |
> |
if ((cur.d = rord[ri].d) < 0 || |
| 301 |
> |
rord[ri].dc*pricerow(pm,cur.s)[cur.d] >= best.price) { |
| 302 |
> |
if (pm->nrows > max2check) break; /* sorted end */ |
| 303 |
> |
continue; /* else skip this one */ |
| 304 |
> |
} |
| 305 |
|
cur.amt = (src_rem[cur.s] < dst_rem[cur.d]) ? |
| 306 |
|
src_rem[cur.s] : dst_rem[cur.d]; |
| 307 |
< |
if (cur.amt > maxamt) cur.amt = maxamt; |
| 308 |
< |
dst_rem[cur.d] -= cur.amt; /* add up differential costs */ |
| 307 |
> |
/* don't just leave smidgen */ |
| 308 |
> |
if (cur.amt > maxamt*1.02) cur.amt = maxamt; |
| 309 |
> |
dst_rem[cur.d] -= cur.amt; /* add up opportunity costs */ |
| 310 |
|
for (i = pm->nrows; i--; ) |
| 311 |
|
if (i != cur.s) |
| 312 |
< |
cost_others += min_cost(src_rem[i], dst_rem, pm, i) |
| 312 |
> |
cost_others += min_cost(src_rem[i], dst_rem, pm, i) |
| 313 |
|
- src_cost[i]; |
| 314 |
|
dst_rem[cur.d] += cur.amt; /* undo trial move */ |
| 315 |
< |
cur.price += cost_others/cur.amt; /* adjust effective price */ |
| 315 |
> |
/* discount effective price */ |
| 316 |
> |
cur.price = ( pricerow(pm,cur.s)[cur.d] + cost_others/cur.amt ) * |
| 317 |
> |
rord[ri].dc; |
| 318 |
|
if (cur.price < best.price) /* are we better than best? */ |
| 319 |
< |
best = cur; |
| 319 |
> |
best = cur; |
| 320 |
|
} |
| 321 |
< |
free(src_cost); /* finish up */ |
| 322 |
< |
|
| 321 |
> |
free(src_cost); /* clean up */ |
| 322 |
> |
free(rord); |
| 323 |
|
if ((best.s < 0) | (best.d < 0)) /* nothing left to move? */ |
| 324 |
|
return(.0); |
| 325 |
|
/* else make the actual move */ |
| 327 |
|
src_rem[best.s] -= best.amt; |
| 328 |
|
dst_rem[best.d] -= best.amt; |
| 329 |
|
return(best.amt); |
| 330 |
+ |
memerr: |
| 331 |
+ |
fprintf(stderr, "%s: Out of memory in migration_step()\n", progname); |
| 332 |
+ |
exit(1); |
| 333 |
+ |
#undef discount |
| 334 |
|
} |
| 335 |
|
|
| 336 |
|
/* Compute and insert migration along directed edge (may fork child) */ |
| 350 |
|
return(NULL); |
| 351 |
|
/* else allocate */ |
| 352 |
|
#ifdef DEBUG |
| 353 |
< |
fprintf(stderr, "Building path from (theta,phi) (%.0f,%.0f) ", |
| 353 |
> |
fprintf(stderr, "Building path from (theta,phi) (%.1f,%.1f) ", |
| 354 |
|
get_theta180(from_rbf->invec), |
| 355 |
|
get_phi360(from_rbf->invec)); |
| 356 |
< |
fprintf(stderr, "to (%.0f,%.0f) with %d x %d matrix\n", |
| 356 |
> |
fprintf(stderr, "to (%.1f,%.1f) with %d x %d matrix\n", |
| 357 |
|
get_theta180(to_rbf->invec), |
| 358 |
|
get_phi360(to_rbf->invec), |
| 359 |
|
from_rbf->nrbf, to_rbf->nrbf); |
| 421 |
|
return(vother[im_rev] != NULL); |
| 422 |
|
} |
| 423 |
|
|
| 424 |
< |
/* Find context hull vertex to complete triangle (oriented call) */ |
| 424 |
> |
/* Find convex hull vertex to complete triangle (oriented call) */ |
| 425 |
|
static RBFNODE * |
| 426 |
|
find_chull_vert(const RBFNODE *rbf0, const RBFNODE *rbf1) |
| 427 |
|
{ |
| 442 |
|
if (DOT(vp, vmid) <= FTINY) |
| 443 |
|
continue; /* wrong orientation */ |
| 444 |
|
area2 = .25*DOT(vp,vp); |
| 445 |
< |
VSUB(vp, rbf->invec, rbf0->invec); |
| 445 |
> |
VSUB(vp, rbf->invec, vmid); |
| 446 |
|
dprod = -DOT(vp, vejn); |
| 447 |
|
VSUM(vp, vp, vejn, dprod); /* above guarantees non-zero */ |
| 448 |
|
dprod = DOT(vp, vmid) / VLEN(vp); |
| 498 |
|
} |
| 499 |
|
} |
| 500 |
|
} |
| 501 |
+ |
|
| 502 |
+ |
/* Add normal direction if missing */ |
| 503 |
+ |
static void |
| 504 |
+ |
check_normal_incidence(void) |
| 505 |
+ |
{ |
| 506 |
+ |
static const FVECT norm_vec = {.0, .0, 1.}; |
| 507 |
+ |
const int saved_nprocs = nprocs; |
| 508 |
+ |
RBFNODE *near_rbf, *mir_rbf, *rbf; |
| 509 |
+ |
double bestd; |
| 510 |
+ |
int n; |
| 511 |
+ |
|
| 512 |
+ |
if (dsf_list == NULL) |
| 513 |
+ |
return; /* XXX should be error? */ |
| 514 |
+ |
near_rbf = dsf_list; |
| 515 |
+ |
bestd = input_orient*near_rbf->invec[2]; |
| 516 |
+ |
if (single_plane_incident) { /* ordered plane incidence? */ |
| 517 |
+ |
if (bestd >= 1.-2.*FTINY) |
| 518 |
+ |
return; /* already have normal */ |
| 519 |
+ |
} else { |
| 520 |
+ |
switch (inp_coverage) { |
| 521 |
+ |
case INP_QUAD1: |
| 522 |
+ |
case INP_QUAD2: |
| 523 |
+ |
case INP_QUAD3: |
| 524 |
+ |
case INP_QUAD4: |
| 525 |
+ |
break; /* quadrilateral symmetry? */ |
| 526 |
+ |
default: |
| 527 |
+ |
return; /* else we can interpolate */ |
| 528 |
+ |
} |
| 529 |
+ |
for (rbf = near_rbf->next; rbf != NULL; rbf = rbf->next) { |
| 530 |
+ |
const double d = input_orient*rbf->invec[2]; |
| 531 |
+ |
if (d >= 1.-2.*FTINY) |
| 532 |
+ |
return; /* seems we have normal */ |
| 533 |
+ |
if (d > bestd) { |
| 534 |
+ |
near_rbf = rbf; |
| 535 |
+ |
bestd = d; |
| 536 |
+ |
} |
| 537 |
+ |
} |
| 538 |
+ |
} |
| 539 |
+ |
if (mig_list != NULL) { /* need to be called first */ |
| 540 |
+ |
fprintf(stderr, "%s: Late call to check_normal_incidence()\n", |
| 541 |
+ |
progname); |
| 542 |
+ |
exit(1); |
| 543 |
+ |
} |
| 544 |
+ |
#ifdef DEBUG |
| 545 |
+ |
fprintf(stderr, "Interpolating normal incidence by mirroring (%.1f,%.1f)\n", |
| 546 |
+ |
get_theta180(near_rbf->invec), get_phi360(near_rbf->invec)); |
| 547 |
+ |
#endif |
| 548 |
+ |
/* mirror nearest incidence */ |
| 549 |
+ |
n = sizeof(RBFNODE) + sizeof(RBFVAL)*(near_rbf->nrbf-1); |
| 550 |
+ |
mir_rbf = (RBFNODE *)malloc(n); |
| 551 |
+ |
if (mir_rbf == NULL) |
| 552 |
+ |
goto memerr; |
| 553 |
+ |
memcpy(mir_rbf, near_rbf, n); |
| 554 |
+ |
mir_rbf->ord = near_rbf->ord - 1; /* not used, I think */ |
| 555 |
+ |
mir_rbf->next = NULL; |
| 556 |
+ |
rev_rbf_symmetry(mir_rbf, MIRROR_X|MIRROR_Y); |
| 557 |
+ |
nprocs = 1; /* compute migration matrix */ |
| 558 |
+ |
if (mig_list != create_migration(mir_rbf, near_rbf)) |
| 559 |
+ |
exit(1); /* XXX should never happen! */ |
| 560 |
+ |
/* interpolate normal dist. */ |
| 561 |
+ |
rbf = e_advect_rbf(mig_list, norm_vec, 2*near_rbf->nrbf); |
| 562 |
+ |
nprocs = saved_nprocs; /* final clean-up */ |
| 563 |
+ |
free(mir_rbf); |
| 564 |
+ |
free(mig_list); |
| 565 |
+ |
mig_list = near_rbf->ejl = NULL; |
| 566 |
+ |
insert_dsf(rbf); /* insert interpolated normal */ |
| 567 |
+ |
return; |
| 568 |
+ |
memerr: |
| 569 |
+ |
fprintf(stderr, "%s: Out of memory in check_normal_incidence()\n", |
| 570 |
+ |
progname); |
| 571 |
+ |
exit(1); |
| 572 |
+ |
} |
| 573 |
|
|
| 574 |
|
/* Build our triangle mesh from recorded RBFs */ |
| 575 |
|
void |
| 578 |
|
double best2 = M_PI*M_PI; |
| 579 |
|
RBFNODE *shrt_edj[2]; |
| 580 |
|
RBFNODE *rbf0, *rbf1; |
| 581 |
+ |
/* add normal if needed */ |
| 582 |
+ |
check_normal_incidence(); |
| 583 |
|
/* check if isotropic */ |
| 584 |
|
if (single_plane_incident) { |
| 585 |
|
for (rbf0 = dsf_list; rbf0 != NULL; rbf0 = rbf0->next) |
