| 7 |
|
* G. Ward |
| 8 |
|
*/ |
| 9 |
|
|
| 10 |
+ |
/**************************************************************** |
| 11 |
+ |
1) Collect samples into a grid using the Shirley-Chiu |
| 12 |
+ |
angular mapping from a hemisphere to a square. |
| 13 |
+ |
|
| 14 |
+ |
2) Compute an adaptive quadtree by subdividing the grid so that |
| 15 |
+ |
each leaf node has at least one sample up to as many |
| 16 |
+ |
samples as fit nicely on a plane to within a certain |
| 17 |
+ |
MSE tolerance. |
| 18 |
+ |
|
| 19 |
+ |
3) Place one Gaussian lobe at each leaf node in the quadtree, |
| 20 |
+ |
sizing it to have a radius equal to the leaf size and |
| 21 |
+ |
a volume equal to the energy in that node. |
| 22 |
+ |
*****************************************************************/ |
| 23 |
+ |
|
| 24 |
|
#define _USE_MATH_DEFINES |
| 25 |
|
#include <stdio.h> |
| 26 |
|
#include <stdlib.h> |
| 29 |
|
#include "bsdfrep.h" |
| 30 |
|
|
| 31 |
|
#ifndef RSCA |
| 32 |
< |
#define RSCA 2.7 /* radius scaling factor (empirical) */ |
| 32 |
> |
#define RSCA 2.2 /* radius scaling factor (empirical) */ |
| 33 |
|
#endif |
| 34 |
+ |
#ifndef SMOOTH_MSE |
| 35 |
+ |
#define SMOOTH_MSE 5e-5 /* acceptable mean squared error */ |
| 36 |
+ |
#endif |
| 37 |
+ |
#ifndef SMOOTH_MSER |
| 38 |
+ |
#define SMOOTH_MSER 0.07 /* acceptable relative MSE */ |
| 39 |
+ |
#endif |
| 40 |
+ |
#define MAX_RAD (GRIDRES/8) /* maximum lobe radius */ |
| 41 |
+ |
|
| 42 |
+ |
#define RBFALLOCB 10 /* RBF allocation block size */ |
| 43 |
+ |
|
| 44 |
|
/* our loaded grid for this incident angle */ |
| 45 |
|
GRIDVAL dsf_grid[GRIDRES][GRIDRES]; |
| 46 |
|
|
| 72 |
|
ovec[1] = sin((M_PI/180.)*phi_out) * ovec[2]; |
| 73 |
|
ovec[2] = sqrt(1. - ovec[2]*ovec[2]); |
| 74 |
|
|
| 75 |
< |
if (!isDSF) |
| 75 |
> |
if (val <= 0) /* truncate to zero */ |
| 76 |
> |
val = 0; |
| 77 |
> |
else if (!isDSF) |
| 78 |
|
val *= ovec[2]; /* convert from BSDF to DSF */ |
| 79 |
|
|
| 80 |
|
/* update BSDF histogram */ |
| 87 |
|
dsf_grid[pos[0]][pos[1]].nval++; |
| 88 |
|
} |
| 89 |
|
|
| 90 |
< |
/* Compute radii for non-empty bins */ |
| 65 |
< |
/* (distance to furthest empty bin for which non-empty bin is the closest) */ |
| 90 |
> |
/* Compute minimum BSDF from histogram (does not clear) */ |
| 91 |
|
static void |
| 92 |
< |
compute_radii(void) |
| 92 |
> |
comp_bsdf_min() |
| 93 |
|
{ |
| 94 |
< |
unsigned int fill_grid[GRIDRES][GRIDRES]; |
| 95 |
< |
unsigned short fill_cnt[GRIDRES][GRIDRES]; |
| 71 |
< |
FVECT ovec0, ovec1; |
| 72 |
< |
double ang2, lastang2; |
| 73 |
< |
int r, i, j, jn, ii, jj, inear, jnear; |
| 94 |
> |
int cnt; |
| 95 |
> |
int i, target; |
| 96 |
|
|
| 97 |
< |
r = GRIDRES/2; /* proceed in zig-zag */ |
| 98 |
< |
for (i = 0; i < GRIDRES; i++) |
| 99 |
< |
for (jn = 0; jn < GRIDRES; jn++) { |
| 100 |
< |
j = (i&1) ? jn : GRIDRES-1-jn; |
| 101 |
< |
if (dsf_grid[i][j].nval) /* find empty grid pos. */ |
| 102 |
< |
continue; |
| 103 |
< |
ovec_from_pos(ovec0, i, j); |
| 104 |
< |
inear = jnear = -1; /* find nearest non-empty */ |
| 105 |
< |
lastang2 = M_PI*M_PI; |
| 106 |
< |
for (ii = i-r; ii <= i+r; ii++) { |
| 107 |
< |
if (ii < 0) continue; |
| 108 |
< |
if (ii >= GRIDRES) break; |
| 109 |
< |
for (jj = j-r; jj <= j+r; jj++) { |
| 110 |
< |
if (jj < 0) continue; |
| 111 |
< |
if (jj >= GRIDRES) break; |
| 112 |
< |
if (!dsf_grid[ii][jj].nval) |
| 113 |
< |
continue; |
| 114 |
< |
ovec_from_pos(ovec1, ii, jj); |
| 115 |
< |
ang2 = 2. - 2.*DOT(ovec0,ovec1); |
| 116 |
< |
if (ang2 >= lastang2) |
| 117 |
< |
continue; |
| 118 |
< |
lastang2 = ang2; |
| 119 |
< |
inear = ii; jnear = jj; |
| 120 |
< |
} |
| 97 |
> |
cnt = 0; |
| 98 |
> |
for (i = HISTLEN; i--; ) |
| 99 |
> |
cnt += bsdf_hist[i]; |
| 100 |
> |
if (!cnt) { /* shouldn't happen */ |
| 101 |
> |
bsdf_min = 0; |
| 102 |
> |
return; |
| 103 |
> |
} |
| 104 |
> |
target = cnt/100; /* ignore bottom 1% */ |
| 105 |
> |
cnt = 0; |
| 106 |
> |
for (i = 0; cnt <= target; i++) |
| 107 |
> |
cnt += bsdf_hist[i]; |
| 108 |
> |
bsdf_min = histval(i-1); |
| 109 |
> |
} |
| 110 |
> |
|
| 111 |
> |
/* Determine if the given region is empty of grid samples */ |
| 112 |
> |
static int |
| 113 |
> |
empty_region(int x0, int x1, int y0, int y1) |
| 114 |
> |
{ |
| 115 |
> |
int x, y; |
| 116 |
> |
|
| 117 |
> |
for (x = x0; x < x1; x++) |
| 118 |
> |
for (y = y0; y < y1; y++) |
| 119 |
> |
if (dsf_grid[x][y].nval) |
| 120 |
> |
return(0); |
| 121 |
> |
return(1); |
| 122 |
> |
} |
| 123 |
> |
|
| 124 |
> |
/* Determine if the given region is smooth enough to be a single lobe */ |
| 125 |
> |
static int |
| 126 |
> |
smooth_region(int x0, int x1, int y0, int y1) |
| 127 |
> |
{ |
| 128 |
> |
RREAL rMtx[3][3]; |
| 129 |
> |
FVECT xvec; |
| 130 |
> |
double A, B, C, nvs, sqerr; |
| 131 |
> |
int x, y, n; |
| 132 |
> |
/* compute planar regression */ |
| 133 |
> |
memset(rMtx, 0, sizeof(rMtx)); |
| 134 |
> |
memset(xvec, 0, sizeof(xvec)); |
| 135 |
> |
for (x = x0; x < x1; x++) |
| 136 |
> |
for (y = y0; y < y1; y++) |
| 137 |
> |
if ((n = dsf_grid[x][y].nval) > 0) { |
| 138 |
> |
double z = dsf_grid[x][y].vsum; |
| 139 |
> |
rMtx[0][0] += x*x*(double)n; |
| 140 |
> |
rMtx[0][1] += x*y*(double)n; |
| 141 |
> |
rMtx[0][2] += x*(double)n; |
| 142 |
> |
rMtx[1][1] += y*y*(double)n; |
| 143 |
> |
rMtx[1][2] += y*(double)n; |
| 144 |
> |
rMtx[2][2] += (double)n; |
| 145 |
> |
xvec[0] += x*z; |
| 146 |
> |
xvec[1] += y*z; |
| 147 |
> |
xvec[2] += z; |
| 148 |
|
} |
| 149 |
< |
if (inear < 0) { |
| 150 |
< |
fprintf(stderr, |
| 151 |
< |
"%s: Could not find non-empty neighbor!\n", |
| 152 |
< |
progname); |
| 153 |
< |
exit(1); |
| 149 |
> |
rMtx[1][0] = rMtx[0][1]; |
| 150 |
> |
rMtx[2][1] = rMtx[1][2]; |
| 151 |
> |
nvs = rMtx[2][2]; |
| 152 |
> |
if (SDinvXform(rMtx, rMtx) != SDEnone) |
| 153 |
> |
return(0); |
| 154 |
> |
A = DOT(rMtx[0], xvec); |
| 155 |
> |
B = DOT(rMtx[1], xvec); |
| 156 |
> |
C = DOT(rMtx[2], xvec); |
| 157 |
> |
sqerr = 0.0; /* compute mean squared error */ |
| 158 |
> |
for (x = x0; x < x1; x++) |
| 159 |
> |
for (y = y0; y < y1; y++) |
| 160 |
> |
if ((n = dsf_grid[x][y].nval) > 0) { |
| 161 |
> |
double d = A*x + B*y + C - dsf_grid[x][y].vsum/n; |
| 162 |
> |
sqerr += n*d*d; |
| 163 |
|
} |
| 164 |
< |
ang2 = sqrt(lastang2); |
| 165 |
< |
r = ANG2R(ang2); /* record if > previous */ |
| 166 |
< |
if (r > dsf_grid[inear][jnear].crad) |
| 167 |
< |
dsf_grid[inear][jnear].crad = r; |
| 110 |
< |
/* next search radius */ |
| 111 |
< |
r = ang2*(2.*GRIDRES/M_PI) + 3; |
| 112 |
< |
} |
| 113 |
< |
/* blur radii over hemisphere */ |
| 114 |
< |
memset(fill_grid, 0, sizeof(fill_grid)); |
| 115 |
< |
memset(fill_cnt, 0, sizeof(fill_cnt)); |
| 116 |
< |
for (i = 0; i < GRIDRES; i++) |
| 117 |
< |
for (j = 0; j < GRIDRES; j++) { |
| 118 |
< |
if (!dsf_grid[i][j].crad) |
| 119 |
< |
continue; /* missing distance */ |
| 120 |
< |
r = R2ANG(dsf_grid[i][j].crad)*(2.*RSCA*GRIDRES/M_PI); |
| 121 |
< |
for (ii = i-r; ii <= i+r; ii++) { |
| 122 |
< |
if (ii < 0) continue; |
| 123 |
< |
if (ii >= GRIDRES) break; |
| 124 |
< |
for (jj = j-r; jj <= j+r; jj++) { |
| 125 |
< |
if (jj < 0) continue; |
| 126 |
< |
if (jj >= GRIDRES) break; |
| 127 |
< |
if ((ii-i)*(ii-i) + (jj-j)*(jj-j) > r*r) |
| 128 |
< |
continue; |
| 129 |
< |
fill_grid[ii][jj] += dsf_grid[i][j].crad; |
| 130 |
< |
fill_cnt[ii][jj]++; |
| 131 |
< |
} |
| 132 |
< |
} |
| 133 |
< |
} |
| 134 |
< |
/* copy back blurred radii */ |
| 135 |
< |
for (i = 0; i < GRIDRES; i++) |
| 136 |
< |
for (j = 0; j < GRIDRES; j++) |
| 137 |
< |
if (fill_cnt[i][j]) |
| 138 |
< |
dsf_grid[i][j].crad = fill_grid[i][j]/fill_cnt[i][j]; |
| 164 |
> |
if (sqerr <= nvs*SMOOTH_MSE) /* below absolute MSE threshold? */ |
| 165 |
> |
return(1); |
| 166 |
> |
/* OR below relative MSE threshold? */ |
| 167 |
> |
return(sqerr*nvs <= xvec[2]*xvec[2]*SMOOTH_MSER); |
| 168 |
|
} |
| 169 |
|
|
| 170 |
< |
/* Cull points for more uniform distribution, leave all nval 0 or 1 */ |
| 170 |
> |
/* Create new lobe based on integrated samples in region */ |
| 171 |
|
static void |
| 172 |
< |
cull_values(void) |
| 172 |
> |
create_lobe(RBFVAL *rvp, int x0, int x1, int y0, int y1) |
| 173 |
|
{ |
| 174 |
< |
FVECT ovec0, ovec1; |
| 175 |
< |
double maxang, maxang2; |
| 176 |
< |
int i, j, ii, jj, r; |
| 177 |
< |
/* simple greedy algorithm */ |
| 178 |
< |
for (i = 0; i < GRIDRES; i++) |
| 179 |
< |
for (j = 0; j < GRIDRES; j++) { |
| 180 |
< |
if (!dsf_grid[i][j].nval) |
| 181 |
< |
continue; |
| 182 |
< |
if (!dsf_grid[i][j].crad) |
| 154 |
< |
continue; /* shouldn't happen */ |
| 155 |
< |
ovec_from_pos(ovec0, i, j); |
| 156 |
< |
maxang = 2.*R2ANG(dsf_grid[i][j].crad); |
| 157 |
< |
if (maxang > ovec0[2]) /* clamp near horizon */ |
| 158 |
< |
maxang = ovec0[2]; |
| 159 |
< |
r = maxang*(2.*GRIDRES/M_PI) + 1; |
| 160 |
< |
maxang2 = maxang*maxang; |
| 161 |
< |
for (ii = i-r; ii <= i+r; ii++) { |
| 162 |
< |
if (ii < 0) continue; |
| 163 |
< |
if (ii >= GRIDRES) break; |
| 164 |
< |
for (jj = j-r; jj <= j+r; jj++) { |
| 165 |
< |
if (jj < 0) continue; |
| 166 |
< |
if (jj >= GRIDRES) break; |
| 167 |
< |
if (!dsf_grid[ii][jj].nval) |
| 168 |
< |
continue; |
| 169 |
< |
if ((ii == i) & (jj == j)) |
| 170 |
< |
continue; /* don't get self-absorbed */ |
| 171 |
< |
ovec_from_pos(ovec1, ii, jj); |
| 172 |
< |
if (2. - 2.*DOT(ovec0,ovec1) >= maxang2) |
| 173 |
< |
continue; |
| 174 |
< |
/* absorb sum */ |
| 175 |
< |
dsf_grid[i][j].vsum += dsf_grid[ii][jj].vsum; |
| 176 |
< |
dsf_grid[i][j].nval += dsf_grid[ii][jj].nval; |
| 177 |
< |
/* keep value, though */ |
| 178 |
< |
dsf_grid[ii][jj].vsum /= (float)dsf_grid[ii][jj].nval; |
| 179 |
< |
dsf_grid[ii][jj].nval = 0; |
| 180 |
< |
} |
| 181 |
< |
} |
| 174 |
> |
double vtot = 0.0; |
| 175 |
> |
int nv = 0; |
| 176 |
> |
double rad; |
| 177 |
> |
int x, y; |
| 178 |
> |
/* compute average for region */ |
| 179 |
> |
for (x = x0; x < x1; x++) |
| 180 |
> |
for (y = y0; y < y1; y++) { |
| 181 |
> |
vtot += dsf_grid[x][y].vsum; |
| 182 |
> |
nv += dsf_grid[x][y].nval; |
| 183 |
|
} |
| 184 |
< |
/* final averaging pass */ |
| 185 |
< |
for (i = 0; i < GRIDRES; i++) |
| 186 |
< |
for (j = 0; j < GRIDRES; j++) |
| 187 |
< |
if (dsf_grid[i][j].nval > 1) { |
| 188 |
< |
dsf_grid[i][j].vsum /= (float)dsf_grid[i][j].nval; |
| 189 |
< |
dsf_grid[i][j].nval = 1; |
| 190 |
< |
} |
| 184 |
> |
if (!nv) { |
| 185 |
> |
fprintf(stderr, "%s: internal - missing samples in create_lobe\n", |
| 186 |
> |
progname); |
| 187 |
> |
exit(1); |
| 188 |
> |
} |
| 189 |
> |
/* peak value based on integral */ |
| 190 |
> |
vtot *= (x1-x0)*(y1-y0)*(2.*M_PI/GRIDRES/GRIDRES)/(double)nv; |
| 191 |
> |
rad = (RSCA/(double)GRIDRES)*(x1-x0); |
| 192 |
> |
rvp->peak = vtot / ((2.*M_PI) * rad*rad); |
| 193 |
> |
rvp->crad = ANG2R(rad); |
| 194 |
> |
rvp->gx = (x0+x1)>>1; |
| 195 |
> |
rvp->gy = (y0+y1)>>1; |
| 196 |
|
} |
| 197 |
|
|
| 198 |
+ |
/* Recursive function to build radial basis function representation */ |
| 199 |
+ |
static int |
| 200 |
+ |
build_rbfrep(RBFVAL **arp, int *np, int x0, int x1, int y0, int y1) |
| 201 |
+ |
{ |
| 202 |
+ |
int xmid = (x0+x1)>>1; |
| 203 |
+ |
int ymid = (y0+y1)>>1; |
| 204 |
+ |
int branched[4]; |
| 205 |
+ |
int nadded, nleaves; |
| 206 |
+ |
/* need to make this a leaf? */ |
| 207 |
+ |
if (empty_region(x0, xmid, y0, ymid) || |
| 208 |
+ |
empty_region(xmid, x1, y0, ymid) || |
| 209 |
+ |
empty_region(x0, xmid, ymid, y1) || |
| 210 |
+ |
empty_region(xmid, x1, ymid, y1)) |
| 211 |
+ |
return(0); |
| 212 |
+ |
/* add children (branches+leaves) */ |
| 213 |
+ |
if ((branched[0] = build_rbfrep(arp, np, x0, xmid, y0, ymid)) < 0) |
| 214 |
+ |
return(-1); |
| 215 |
+ |
if ((branched[1] = build_rbfrep(arp, np, xmid, x1, y0, ymid)) < 0) |
| 216 |
+ |
return(-1); |
| 217 |
+ |
if ((branched[2] = build_rbfrep(arp, np, x0, xmid, ymid, y1)) < 0) |
| 218 |
+ |
return(-1); |
| 219 |
+ |
if ((branched[3] = build_rbfrep(arp, np, xmid, x1, ymid, y1)) < 0) |
| 220 |
+ |
return(-1); |
| 221 |
+ |
nadded = branched[0] + branched[1] + branched[2] + branched[3]; |
| 222 |
+ |
nleaves = !branched[0] + !branched[1] + !branched[2] + !branched[3]; |
| 223 |
+ |
if (!nleaves) /* nothing but branches? */ |
| 224 |
+ |
return(nadded); |
| 225 |
+ |
/* combine 4 leaves into 1? */ |
| 226 |
+ |
if (nleaves == 4 && x1-x0 < MAX_RAD && smooth_region(x0, x1, y0, y1)) |
| 227 |
+ |
return(0); |
| 228 |
+ |
/* need more array space? */ |
| 229 |
+ |
if ((*np+nleaves-1)>>RBFALLOCB != (*np-1)>>RBFALLOCB) { |
| 230 |
+ |
*arp = (RBFVAL *)realloc(*arp, |
| 231 |
+ |
sizeof(RBFVAL)*(*np+nleaves-1+(1<<RBFALLOCB))); |
| 232 |
+ |
if (*arp == NULL) |
| 233 |
+ |
return(-1); |
| 234 |
+ |
} |
| 235 |
+ |
/* create lobes for leaves */ |
| 236 |
+ |
if (!branched[0]) |
| 237 |
+ |
create_lobe(*arp+(*np)++, x0, xmid, y0, ymid); |
| 238 |
+ |
if (!branched[1]) |
| 239 |
+ |
create_lobe(*arp+(*np)++, xmid, x1, y0, ymid); |
| 240 |
+ |
if (!branched[2]) |
| 241 |
+ |
create_lobe(*arp+(*np)++, x0, xmid, ymid, y1); |
| 242 |
+ |
if (!branched[3]) |
| 243 |
+ |
create_lobe(*arp+(*np)++, xmid, x1, ymid, y1); |
| 244 |
+ |
nadded += nleaves; |
| 245 |
+ |
return(nadded); |
| 246 |
+ |
} |
| 247 |
+ |
|
| 248 |
|
/* Count up filled nodes and build RBF representation from current grid */ |
| 249 |
|
RBFNODE * |
| 250 |
< |
make_rbfrep(void) |
| 250 |
> |
make_rbfrep() |
| 251 |
|
{ |
| 196 |
– |
int niter = 16; |
| 197 |
– |
double lastVar, thisVar = 100.; |
| 198 |
– |
int nn; |
| 252 |
|
RBFNODE *newnode; |
| 253 |
< |
RBFVAL *itera; |
| 254 |
< |
int i, j; |
| 255 |
< |
/* compute RBF radii */ |
| 256 |
< |
compute_radii(); |
| 257 |
< |
/* coagulate lobes */ |
| 258 |
< |
cull_values(); |
| 259 |
< |
nn = 0; /* count selected bins */ |
| 260 |
< |
for (i = 0; i < GRIDRES; i++) |
| 261 |
< |
for (j = 0; j < GRIDRES; j++) |
| 262 |
< |
nn += dsf_grid[i][j].nval; |
| 263 |
< |
/* allocate RBF array */ |
| 211 |
< |
newnode = (RBFNODE *)malloc(sizeof(RBFNODE) + sizeof(RBFVAL)*(nn-1)); |
| 253 |
> |
RBFVAL *rbfarr; |
| 254 |
> |
int nn; |
| 255 |
> |
/* compute minimum BSDF */ |
| 256 |
> |
comp_bsdf_min(); |
| 257 |
> |
/* create RBF node list */ |
| 258 |
> |
rbfarr = NULL; nn = 0; |
| 259 |
> |
if (build_rbfrep(&rbfarr, &nn, 0, GRIDRES, 0, GRIDRES) <= 0) |
| 260 |
> |
goto memerr; |
| 261 |
> |
/* (re)allocate RBF array */ |
| 262 |
> |
newnode = (RBFNODE *)realloc(rbfarr, |
| 263 |
> |
sizeof(RBFNODE) + sizeof(RBFVAL)*(nn-1)); |
| 264 |
|
if (newnode == NULL) |
| 265 |
|
goto memerr; |
| 266 |
+ |
/* copy computed lobes into RBF node */ |
| 267 |
+ |
memmove(newnode->rbfa, newnode, sizeof(RBFVAL)*nn); |
| 268 |
|
newnode->ord = -1; |
| 269 |
|
newnode->next = NULL; |
| 270 |
|
newnode->ejl = NULL; |
| 272 |
|
newnode->invec[0] = cos((M_PI/180.)*phi_in_deg)*newnode->invec[2]; |
| 273 |
|
newnode->invec[1] = sin((M_PI/180.)*phi_in_deg)*newnode->invec[2]; |
| 274 |
|
newnode->invec[2] = input_orient*sqrt(1. - newnode->invec[2]*newnode->invec[2]); |
| 275 |
< |
newnode->vtotal = 0; |
| 275 |
> |
newnode->vtotal = .0; |
| 276 |
|
newnode->nrbf = nn; |
| 277 |
< |
nn = 0; /* fill RBF array */ |
| 278 |
< |
for (i = 0; i < GRIDRES; i++) |
| 279 |
< |
for (j = 0; j < GRIDRES; j++) |
| 226 |
< |
if (dsf_grid[i][j].nval) { |
| 227 |
< |
newnode->rbfa[nn].peak = dsf_grid[i][j].vsum; |
| 228 |
< |
newnode->rbfa[nn].crad = RSCA*dsf_grid[i][j].crad + .5; |
| 229 |
< |
newnode->rbfa[nn].gx = i; |
| 230 |
< |
newnode->rbfa[nn].gy = j; |
| 231 |
< |
++nn; |
| 232 |
< |
} |
| 233 |
< |
/* iterate to improve interpolation accuracy */ |
| 234 |
< |
itera = (RBFVAL *)malloc(sizeof(RBFVAL)*newnode->nrbf); |
| 235 |
< |
if (itera == NULL) |
| 236 |
< |
goto memerr; |
| 237 |
< |
memcpy(itera, newnode->rbfa, sizeof(RBFVAL)*newnode->nrbf); |
| 238 |
< |
do { |
| 239 |
< |
double dsum = 0, dsum2 = 0; |
| 240 |
< |
nn = 0; |
| 241 |
< |
for (i = 0; i < GRIDRES; i++) |
| 242 |
< |
for (j = 0; j < GRIDRES; j++) |
| 243 |
< |
if (dsf_grid[i][j].nval) { |
| 244 |
< |
FVECT odir; |
| 245 |
< |
double corr; |
| 246 |
< |
ovec_from_pos(odir, i, j); |
| 247 |
< |
itera[nn++].peak *= corr = |
| 248 |
< |
dsf_grid[i][j].vsum / |
| 249 |
< |
eval_rbfrep(newnode, odir); |
| 250 |
< |
dsum += 1. - corr; |
| 251 |
< |
dsum2 += (1.-corr)*(1.-corr); |
| 252 |
< |
} |
| 253 |
< |
memcpy(newnode->rbfa, itera, sizeof(RBFVAL)*newnode->nrbf); |
| 254 |
< |
lastVar = thisVar; |
| 255 |
< |
thisVar = dsum2/(double)nn; |
| 277 |
> |
/* compute sum for normalization */ |
| 278 |
> |
while (nn-- > 0) |
| 279 |
> |
newnode->vtotal += rbf_volume(&newnode->rbfa[nn]); |
| 280 |
|
#ifdef DEBUG |
| 281 |
< |
fprintf(stderr, "Avg., RMS error: %.1f%% %.1f%%\n", |
| 258 |
< |
100.*dsum/(double)nn, |
| 259 |
< |
100.*sqrt(thisVar)); |
| 260 |
< |
#endif |
| 261 |
< |
} while (--niter > 0 && lastVar-thisVar > 0.02*lastVar); |
| 262 |
< |
|
| 263 |
< |
free(itera); |
| 264 |
< |
nn = 0; /* compute sum for normalization */ |
| 265 |
< |
while (nn < newnode->nrbf) |
| 266 |
< |
newnode->vtotal += rbf_volume(&newnode->rbfa[nn++]); |
| 267 |
< |
#ifdef DEBUG |
| 281 |
> |
fprintf(stderr, "Built RBF with %d lobes\n", newnode->nrbf); |
| 282 |
|
fprintf(stderr, "Integrated DSF at (%.1f,%.1f) deg. is %.2f\n", |
| 283 |
|
get_theta180(newnode->invec), get_phi360(newnode->invec), |
| 284 |
|
newnode->vtotal); |
