14 |
|
#include <math.h> |
15 |
|
#include "bsdfrep.h" |
16 |
|
|
17 |
< |
#ifndef MINRSCA |
18 |
< |
#define MINRSCA 0.15 /* minimum radius scaling factor */ |
17 |
> |
#ifndef RSCA |
18 |
> |
#define RSCA 2.2 /* radius scaling factor (empirical) */ |
19 |
|
#endif |
20 |
< |
#ifndef MAXRSCA |
21 |
< |
#define MAXRSCA 2.7 /* maximum radius scaling factor */ |
20 |
> |
#ifndef SMOOTH_MSE |
21 |
> |
#define SMOOTH_MSE 5e-5 /* acceptable mean squared error */ |
22 |
|
#endif |
23 |
< |
#ifndef MAXFRAC |
24 |
< |
#define MAXFRAC 0.5 /* maximum contribution to neighbor */ |
23 |
> |
#ifndef SMOOTH_MSER |
24 |
> |
#define SMOOTH_MSER 0.07 /* acceptable relative MSE */ |
25 |
|
#endif |
26 |
< |
#ifndef NNEIGH |
27 |
< |
#define NNEIGH 10 /* number of neighbors to consider */ |
28 |
< |
#endif |
26 |
> |
#define MAX_RAD (GRIDRES/8) /* maximum lobe radius */ |
27 |
> |
|
28 |
> |
#define RBFALLOCB 10 /* RBF allocation block size */ |
29 |
> |
|
30 |
|
/* our loaded grid for this incident angle */ |
31 |
|
GRIDVAL dsf_grid[GRIDRES][GRIDRES]; |
32 |
|
|
73 |
|
dsf_grid[pos[0]][pos[1]].nval++; |
74 |
|
} |
75 |
|
|
76 |
< |
/* Compute radii for non-empty bins */ |
76 |
< |
/* (distance to furthest empty bin for which non-empty test bin is closest) */ |
76 |
> |
/* Compute minimum BSDF from histogram (does not clear) */ |
77 |
|
static void |
78 |
– |
compute_radii(void) |
79 |
– |
{ |
80 |
– |
const int cradmin = ANG2R(.5*M_PI/GRIDRES); |
81 |
– |
unsigned int fill_grid[GRIDRES][GRIDRES]; |
82 |
– |
unsigned short fill_cnt[GRIDRES][GRIDRES]; |
83 |
– |
FVECT ovec0, ovec1; |
84 |
– |
double ang2, lastang2; |
85 |
– |
int r, i, j, jn, ii, jj, inear, jnear; |
86 |
– |
|
87 |
– |
for (i = 0; i < GRIDRES; i++) /* initialize minimum radii */ |
88 |
– |
for (j = 0; j < GRIDRES; j++) |
89 |
– |
if (dsf_grid[i][j].nval) |
90 |
– |
dsf_grid[i][j].crad = cradmin; |
91 |
– |
|
92 |
– |
r = GRIDRES/2; /* proceed in zig-zag */ |
93 |
– |
for (i = 0; i < GRIDRES; i++) |
94 |
– |
for (jn = 0; jn < GRIDRES; jn++) { |
95 |
– |
j = (i&1) ? jn : GRIDRES-1-jn; |
96 |
– |
if (dsf_grid[i][j].nval) /* find empty grid pos. */ |
97 |
– |
continue; |
98 |
– |
ovec_from_pos(ovec0, i, j); |
99 |
– |
inear = jnear = -1; /* find nearest non-empty */ |
100 |
– |
lastang2 = M_PI*M_PI; |
101 |
– |
for (ii = i-r; ii <= i+r; ii++) { |
102 |
– |
if (ii < 0) continue; |
103 |
– |
if (ii >= GRIDRES) break; |
104 |
– |
for (jj = j-r; jj <= j+r; jj++) { |
105 |
– |
if (jj < 0) continue; |
106 |
– |
if (jj >= GRIDRES) break; |
107 |
– |
if (!dsf_grid[ii][jj].nval) |
108 |
– |
continue; |
109 |
– |
ovec_from_pos(ovec1, ii, jj); |
110 |
– |
ang2 = 2. - 2.*DOT(ovec0,ovec1); |
111 |
– |
if (ang2 >= lastang2) |
112 |
– |
continue; |
113 |
– |
lastang2 = ang2; |
114 |
– |
inear = ii; jnear = jj; |
115 |
– |
} |
116 |
– |
} |
117 |
– |
if (inear < 0) { |
118 |
– |
fprintf(stderr, |
119 |
– |
"%s: Could not find non-empty neighbor!\n", |
120 |
– |
progname); |
121 |
– |
exit(1); |
122 |
– |
} |
123 |
– |
ang2 = sqrt(lastang2); |
124 |
– |
r = ANG2R(ang2); /* record if > previous */ |
125 |
– |
if (r > dsf_grid[inear][jnear].crad) |
126 |
– |
dsf_grid[inear][jnear].crad = r; |
127 |
– |
/* next search radius */ |
128 |
– |
r = ang2*(2.*GRIDRES/M_PI) + 3; |
129 |
– |
} |
130 |
– |
/* blur radii over hemisphere */ |
131 |
– |
memset(fill_grid, 0, sizeof(fill_grid)); |
132 |
– |
memset(fill_cnt, 0, sizeof(fill_cnt)); |
133 |
– |
for (i = 0; i < GRIDRES; i++) |
134 |
– |
for (j = 0; j < GRIDRES; j++) { |
135 |
– |
if (!dsf_grid[i][j].nval) |
136 |
– |
continue; /* not part of this */ |
137 |
– |
r = R2ANG(dsf_grid[i][j].crad)*(2.*MAXRSCA*GRIDRES/M_PI); |
138 |
– |
for (ii = i-r; ii <= i+r; ii++) { |
139 |
– |
if (ii < 0) continue; |
140 |
– |
if (ii >= GRIDRES) break; |
141 |
– |
for (jj = j-r; jj <= j+r; jj++) { |
142 |
– |
if (jj < 0) continue; |
143 |
– |
if (jj >= GRIDRES) break; |
144 |
– |
if ((ii-i)*(ii-i) + (jj-j)*(jj-j) > r*r) |
145 |
– |
continue; |
146 |
– |
fill_grid[ii][jj] += dsf_grid[i][j].crad; |
147 |
– |
fill_cnt[ii][jj]++; |
148 |
– |
} |
149 |
– |
} |
150 |
– |
} |
151 |
– |
/* copy back blurred radii */ |
152 |
– |
for (i = 0; i < GRIDRES; i++) |
153 |
– |
for (j = 0; j < GRIDRES; j++) |
154 |
– |
if (fill_cnt[i][j]) |
155 |
– |
dsf_grid[i][j].crad = fill_grid[i][j]/fill_cnt[i][j]; |
156 |
– |
} |
157 |
– |
|
158 |
– |
/* Cull points for more uniform distribution, leave all nval 0 or 1 */ |
159 |
– |
static void |
160 |
– |
cull_values(void) |
161 |
– |
{ |
162 |
– |
FVECT ovec0, ovec1; |
163 |
– |
double maxang, maxang2; |
164 |
– |
int i, j, ii, jj, r; |
165 |
– |
/* simple greedy algorithm */ |
166 |
– |
for (i = 0; i < GRIDRES; i++) |
167 |
– |
for (j = 0; j < GRIDRES; j++) { |
168 |
– |
if (!dsf_grid[i][j].nval) |
169 |
– |
continue; |
170 |
– |
if (!dsf_grid[i][j].crad) |
171 |
– |
continue; /* shouldn't happen */ |
172 |
– |
ovec_from_pos(ovec0, i, j); |
173 |
– |
maxang = 2.*R2ANG(dsf_grid[i][j].crad); |
174 |
– |
if (maxang > ovec0[2]) /* clamp near horizon */ |
175 |
– |
maxang = ovec0[2]; |
176 |
– |
r = maxang*(2.*GRIDRES/M_PI) + 1; |
177 |
– |
maxang2 = maxang*maxang; |
178 |
– |
for (ii = i-r; ii <= i+r; ii++) { |
179 |
– |
if (ii < 0) continue; |
180 |
– |
if (ii >= GRIDRES) break; |
181 |
– |
for (jj = j-r; jj <= j+r; jj++) { |
182 |
– |
if ((ii == i) & (jj == j)) |
183 |
– |
continue; /* don't get self-absorbed */ |
184 |
– |
if (jj < 0) continue; |
185 |
– |
if (jj >= GRIDRES) break; |
186 |
– |
if (!dsf_grid[ii][jj].nval) |
187 |
– |
continue; |
188 |
– |
ovec_from_pos(ovec1, ii, jj); |
189 |
– |
if (2. - 2.*DOT(ovec0,ovec1) >= maxang2) |
190 |
– |
continue; |
191 |
– |
/* absorb sum */ |
192 |
– |
dsf_grid[i][j].vsum += dsf_grid[ii][jj].vsum; |
193 |
– |
dsf_grid[i][j].nval += dsf_grid[ii][jj].nval; |
194 |
– |
/* keep value, though */ |
195 |
– |
dsf_grid[ii][jj].vsum /= (float)dsf_grid[ii][jj].nval; |
196 |
– |
dsf_grid[ii][jj].nval = 0; |
197 |
– |
} |
198 |
– |
} |
199 |
– |
} |
200 |
– |
/* final averaging pass */ |
201 |
– |
for (i = 0; i < GRIDRES; i++) |
202 |
– |
for (j = 0; j < GRIDRES; j++) |
203 |
– |
if (dsf_grid[i][j].nval > 1) { |
204 |
– |
dsf_grid[i][j].vsum /= (float)dsf_grid[i][j].nval; |
205 |
– |
dsf_grid[i][j].nval = 1; |
206 |
– |
} |
207 |
– |
} |
208 |
– |
|
209 |
– |
/* Compute minimum BSDF from histogram and clear it */ |
210 |
– |
static void |
78 |
|
comp_bsdf_min() |
79 |
|
{ |
80 |
|
int cnt; |
92 |
|
for (i = 0; cnt <= target; i++) |
93 |
|
cnt += bsdf_hist[i]; |
94 |
|
bsdf_min = histval(i-1); |
228 |
– |
memset(bsdf_hist, 0, sizeof(bsdf_hist)); |
95 |
|
} |
96 |
|
|
97 |
< |
/* Find n nearest sub-sampled neighbors to the given grid position */ |
97 |
> |
/* Determine if the given region is empty of grid samples */ |
98 |
|
static int |
99 |
< |
get_neighbors(int neigh[][2], int n, const int i, const int j) |
99 |
> |
empty_region(int x0, int x1, int y0, int y1) |
100 |
|
{ |
101 |
< |
int k = 0; |
102 |
< |
int r; |
103 |
< |
/* search concentric squares */ |
104 |
< |
for (r = 1; r < GRIDRES; r++) { |
105 |
< |
int ii, jj; |
106 |
< |
for (ii = i-r; ii <= i+r; ii++) { |
107 |
< |
int jstep = 1; |
108 |
< |
if (ii < 0) continue; |
109 |
< |
if (ii >= GRIDRES) break; |
110 |
< |
if ((i-r < ii) & (ii < i+r)) |
111 |
< |
jstep = r<<1; |
112 |
< |
for (jj = j-r; jj <= j+r; jj += jstep) { |
113 |
< |
if (jj < 0) continue; |
114 |
< |
if (jj >= GRIDRES) break; |
115 |
< |
if (dsf_grid[ii][jj].nval) { |
116 |
< |
neigh[k][0] = ii; |
117 |
< |
neigh[k][1] = jj; |
118 |
< |
if (++k >= n) |
119 |
< |
return(n); |
120 |
< |
} |
121 |
< |
} |
101 |
> |
int x, y; |
102 |
> |
|
103 |
> |
for (x = x0; x < x1; x++) |
104 |
> |
for (y = y0; y < y1; y++) |
105 |
> |
if (dsf_grid[x][y].nval) |
106 |
> |
return(0); |
107 |
> |
return(1); |
108 |
> |
} |
109 |
> |
|
110 |
> |
/* Determine if the given region is smooth enough to be a single lobe */ |
111 |
> |
static int |
112 |
> |
smooth_region(int x0, int x1, int y0, int y1) |
113 |
> |
{ |
114 |
> |
RREAL rMtx[3][3]; |
115 |
> |
FVECT xvec; |
116 |
> |
double A, B, C, nvs, sqerr; |
117 |
> |
int x, y, n; |
118 |
> |
/* compute planar regression */ |
119 |
> |
memset(rMtx, 0, sizeof(rMtx)); |
120 |
> |
memset(xvec, 0, sizeof(xvec)); |
121 |
> |
for (x = x0; x < x1; x++) |
122 |
> |
for (y = y0; y < y1; y++) |
123 |
> |
if ((n = dsf_grid[x][y].nval) > 0) { |
124 |
> |
double z = dsf_grid[x][y].vsum; |
125 |
> |
rMtx[0][0] += n*x*x; |
126 |
> |
rMtx[0][1] += n*x*y; |
127 |
> |
rMtx[0][2] += n*x; |
128 |
> |
rMtx[1][1] += n*y*y; |
129 |
> |
rMtx[1][2] += n*y; |
130 |
> |
rMtx[2][2] += n; |
131 |
> |
xvec[0] += x*z; |
132 |
> |
xvec[1] += y*z; |
133 |
> |
xvec[2] += z; |
134 |
|
} |
135 |
+ |
rMtx[1][0] = rMtx[0][1]; |
136 |
+ |
rMtx[2][1] = rMtx[1][2]; |
137 |
+ |
nvs = rMtx[2][2]; |
138 |
+ |
if (SDinvXform(rMtx, rMtx) != SDEnone) |
139 |
+ |
return(0); |
140 |
+ |
A = DOT(rMtx[0], xvec); |
141 |
+ |
B = DOT(rMtx[1], xvec); |
142 |
+ |
C = DOT(rMtx[2], xvec); |
143 |
+ |
sqerr = 0.0; /* compute mean squared error */ |
144 |
+ |
for (x = x0; x < x1; x++) |
145 |
+ |
for (y = y0; y < y1; y++) |
146 |
+ |
if ((n = dsf_grid[x][y].nval) > 0) { |
147 |
+ |
double d = A*x + B*y + C - dsf_grid[x][y].vsum/n; |
148 |
+ |
sqerr += n*d*d; |
149 |
+ |
} |
150 |
+ |
if (sqerr <= nvs*SMOOTH_MSE) /* below absolute MSE threshold? */ |
151 |
+ |
return(1); |
152 |
+ |
/* below relative MSE threshold? */ |
153 |
+ |
return(sqerr*nvs <= xvec[2]*xvec[2]*SMOOTH_MSER); |
154 |
+ |
} |
155 |
+ |
|
156 |
+ |
/* Create new lobe based on integrated samples in region */ |
157 |
+ |
static void |
158 |
+ |
create_lobe(RBFVAL *rvp, int x0, int x1, int y0, int y1) |
159 |
+ |
{ |
160 |
+ |
double vtot = 0.0; |
161 |
+ |
int nv = 0; |
162 |
+ |
double rad; |
163 |
+ |
int x, y; |
164 |
+ |
/* compute average for region */ |
165 |
+ |
for (x = x0; x < x1; x++) |
166 |
+ |
for (y = y0; y < y1; y++) { |
167 |
+ |
vtot += dsf_grid[x][y].vsum; |
168 |
+ |
nv += dsf_grid[x][y].nval; |
169 |
+ |
} |
170 |
+ |
if (!nv) { |
171 |
+ |
fprintf(stderr, "%s: internal - missing samples in create_lobe\n", |
172 |
+ |
progname); |
173 |
+ |
exit(1); |
174 |
|
} |
175 |
< |
return(k); |
175 |
> |
/* peak value based on integral */ |
176 |
> |
vtot *= (x1-x0)*(y1-y0)*(2.*M_PI/GRIDRES/GRIDRES)/(double)nv; |
177 |
> |
rad = (RSCA/(double)GRIDRES)*(x1-x0); |
178 |
> |
rvp->peak = vtot / ((2.*M_PI) * rad*rad); |
179 |
> |
rvp->crad = ANG2R(rad); |
180 |
> |
rvp->gx = (x0+x1)>>1; |
181 |
> |
rvp->gy = (y0+y1)>>1; |
182 |
|
} |
183 |
|
|
184 |
< |
/* Adjust coded radius for the given grid position based on neighborhood */ |
184 |
> |
/* Recursive function to build radial basis function representation */ |
185 |
|
static int |
186 |
< |
adj_coded_radius(const int i, const int j) |
186 |
> |
build_rbfrep(RBFVAL **arp, int *np, int x0, int x1, int y0, int y1) |
187 |
|
{ |
188 |
< |
const double rad0 = R2ANG(dsf_grid[i][j].crad); |
189 |
< |
const double minrad = MINRSCA * rad0; |
190 |
< |
double currad = MAXRSCA * rad0; |
191 |
< |
int neigh[NNEIGH][2]; |
192 |
< |
int n; |
193 |
< |
FVECT our_dir; |
194 |
< |
|
195 |
< |
ovec_from_pos(our_dir, i, j); |
196 |
< |
n = get_neighbors(neigh, NNEIGH, i, j); |
197 |
< |
while (n--) { |
198 |
< |
FVECT their_dir; |
199 |
< |
double max_ratio, rad_ok2; |
200 |
< |
/* check our value at neighbor */ |
201 |
< |
ovec_from_pos(their_dir, neigh[n][0], neigh[n][1]); |
202 |
< |
max_ratio = MAXFRAC * dsf_grid[neigh[n][0]][neigh[n][1]].vsum |
203 |
< |
/ dsf_grid[i][j].vsum; |
204 |
< |
if (max_ratio >= 1) |
205 |
< |
continue; |
206 |
< |
rad_ok2 = (DOT(their_dir,our_dir) - 1.)/log(max_ratio); |
207 |
< |
if (rad_ok2 >= currad*currad) |
208 |
< |
continue; /* value fraction OK */ |
209 |
< |
currad = sqrt(rad_ok2); /* else reduce lobe radius */ |
210 |
< |
if (currad <= minrad) /* limit how small we'll go */ |
211 |
< |
return(ANG2R(minrad)); |
188 |
> |
int xmid = (x0+x1)>>1; |
189 |
> |
int ymid = (y0+y1)>>1; |
190 |
> |
int branched[4]; |
191 |
> |
int nadded, nleaves; |
192 |
> |
/* need to make this a leaf? */ |
193 |
> |
if (empty_region(x0, xmid, y0, ymid) || |
194 |
> |
empty_region(xmid, x1, y0, ymid) || |
195 |
> |
empty_region(x0, xmid, ymid, y1) || |
196 |
> |
empty_region(xmid, x1, ymid, y1)) |
197 |
> |
return(0); |
198 |
> |
/* add children (branches+leaves) */ |
199 |
> |
if ((branched[0] = build_rbfrep(arp, np, x0, xmid, y0, ymid)) < 0) |
200 |
> |
return(-1); |
201 |
> |
if ((branched[1] = build_rbfrep(arp, np, xmid, x1, y0, ymid)) < 0) |
202 |
> |
return(-1); |
203 |
> |
if ((branched[2] = build_rbfrep(arp, np, x0, xmid, ymid, y1)) < 0) |
204 |
> |
return(-1); |
205 |
> |
if ((branched[3] = build_rbfrep(arp, np, xmid, x1, ymid, y1)) < 0) |
206 |
> |
return(-1); |
207 |
> |
nadded = branched[0] + branched[1] + branched[2] + branched[3]; |
208 |
> |
nleaves = !branched[0] + !branched[1] + !branched[2] + !branched[3]; |
209 |
> |
if (!nleaves) /* nothing but branches? */ |
210 |
> |
return(nadded); |
211 |
> |
/* combine 4 leaves into 1? */ |
212 |
> |
if (nleaves == 4 && x1-x0 < MAX_RAD && smooth_region(x0, x1, y0, y1)) |
213 |
> |
return(0); |
214 |
> |
/* need more array space? */ |
215 |
> |
if ((*np+nleaves-1)>>RBFALLOCB != (*np-1)>>RBFALLOCB) { |
216 |
> |
*arp = (RBFVAL *)realloc(*arp, |
217 |
> |
sizeof(RBFVAL)*(*np+nleaves-1+(1<<RBFALLOCB))); |
218 |
> |
if (*arp == NULL) |
219 |
> |
return(-1); |
220 |
|
} |
221 |
< |
return(ANG2R(currad)); /* encode selected radius */ |
221 |
> |
/* create lobes for leaves */ |
222 |
> |
if (!branched[0]) |
223 |
> |
create_lobe(*arp+(*np)++, x0, xmid, y0, ymid); |
224 |
> |
if (!branched[1]) |
225 |
> |
create_lobe(*arp+(*np)++, xmid, x1, y0, ymid); |
226 |
> |
if (!branched[2]) |
227 |
> |
create_lobe(*arp+(*np)++, x0, xmid, ymid, y1); |
228 |
> |
if (!branched[3]) |
229 |
> |
create_lobe(*arp+(*np)++, xmid, x1, ymid, y1); |
230 |
> |
nadded += nleaves; |
231 |
> |
return(nadded); |
232 |
|
} |
233 |
|
|
234 |
|
/* Count up filled nodes and build RBF representation from current grid */ |
235 |
|
RBFNODE * |
236 |
< |
make_rbfrep(void) |
236 |
> |
make_rbfrep() |
237 |
|
{ |
297 |
– |
long cradsum = 0, ocradsum = 0; |
298 |
– |
int niter = 16; |
299 |
– |
double lastVar, thisVar = 100.; |
300 |
– |
int nn; |
238 |
|
RBFNODE *newnode; |
239 |
< |
RBFVAL *itera; |
240 |
< |
int i, j; |
304 |
< |
|
305 |
< |
#ifdef DEBUG |
306 |
< |
{ |
307 |
< |
int maxcnt = 0, nempty = 0; |
308 |
< |
long cntsum = 0; |
309 |
< |
for (i = 0; i < GRIDRES; i++) |
310 |
< |
for (j = 0; j < GRIDRES; j++) |
311 |
< |
if (!dsf_grid[i][j].nval) { |
312 |
< |
++nempty; |
313 |
< |
} else { |
314 |
< |
if (dsf_grid[i][j].nval > maxcnt) |
315 |
< |
maxcnt = dsf_grid[i][j].nval; |
316 |
< |
cntsum += dsf_grid[i][j].nval; |
317 |
< |
} |
318 |
< |
fprintf(stderr, "Average, maximum bin count: %d, %d (%.1f%% empty)\n", |
319 |
< |
(int)(cntsum/((GRIDRES*GRIDRES)-nempty)), maxcnt, |
320 |
< |
100./(GRIDRES*GRIDRES)*nempty); |
321 |
< |
} |
322 |
< |
#endif |
323 |
< |
/* compute RBF radii */ |
324 |
< |
compute_radii(); |
325 |
< |
/* coagulate lobes */ |
326 |
< |
cull_values(); |
327 |
< |
nn = 0; /* count selected bins */ |
328 |
< |
for (i = 0; i < GRIDRES; i++) |
329 |
< |
for (j = 0; j < GRIDRES; j++) |
330 |
< |
nn += dsf_grid[i][j].nval; |
239 |
> |
RBFVAL *rbfarr; |
240 |
> |
int nn; |
241 |
|
/* compute minimum BSDF */ |
242 |
|
comp_bsdf_min(); |
243 |
< |
/* allocate RBF array */ |
244 |
< |
newnode = (RBFNODE *)malloc(sizeof(RBFNODE) + sizeof(RBFVAL)*(nn-1)); |
243 |
> |
/* create RBF node list */ |
244 |
> |
rbfarr = NULL; nn = 0; |
245 |
> |
if (build_rbfrep(&rbfarr, &nn, 0, GRIDRES, 0, GRIDRES) <= 0) |
246 |
> |
goto memerr; |
247 |
> |
/* (re)allocate RBF array */ |
248 |
> |
newnode = (RBFNODE *)realloc(rbfarr, |
249 |
> |
sizeof(RBFNODE) + sizeof(RBFVAL)*(nn-1)); |
250 |
|
if (newnode == NULL) |
251 |
|
goto memerr; |
252 |
+ |
/* copy computed lobes into RBF node */ |
253 |
+ |
memmove(newnode->rbfa, newnode, sizeof(RBFVAL)*nn); |
254 |
|
newnode->ord = -1; |
255 |
|
newnode->next = NULL; |
256 |
|
newnode->ejl = NULL; |
258 |
|
newnode->invec[0] = cos((M_PI/180.)*phi_in_deg)*newnode->invec[2]; |
259 |
|
newnode->invec[1] = sin((M_PI/180.)*phi_in_deg)*newnode->invec[2]; |
260 |
|
newnode->invec[2] = input_orient*sqrt(1. - newnode->invec[2]*newnode->invec[2]); |
261 |
< |
newnode->vtotal = 0; |
261 |
> |
newnode->vtotal = .0; |
262 |
|
newnode->nrbf = nn; |
263 |
< |
nn = 0; /* fill RBF array */ |
264 |
< |
for (i = 0; i < GRIDRES; i++) |
265 |
< |
for (j = 0; j < GRIDRES; j++) |
349 |
< |
if (dsf_grid[i][j].nval) { |
350 |
< |
newnode->rbfa[nn].peak = dsf_grid[i][j].vsum; |
351 |
< |
ocradsum += dsf_grid[i][j].crad; |
352 |
< |
cradsum += |
353 |
< |
newnode->rbfa[nn].crad = adj_coded_radius(i, j); |
354 |
< |
newnode->rbfa[nn].gx = i; |
355 |
< |
newnode->rbfa[nn].gy = j; |
356 |
< |
++nn; |
357 |
< |
} |
263 |
> |
/* compute sum for normalization */ |
264 |
> |
while (nn-- > 0) |
265 |
> |
newnode->vtotal += rbf_volume(&newnode->rbfa[nn]); |
266 |
|
#ifdef DEBUG |
267 |
< |
fprintf(stderr, |
360 |
< |
"Average radius reduced from %.2f to %.2f degrees for %d lobes\n", |
361 |
< |
180./M_PI*MAXRSCA*R2ANG(ocradsum/newnode->nrbf), |
362 |
< |
180./M_PI*R2ANG(cradsum/newnode->nrbf), newnode->nrbf); |
363 |
< |
#endif |
364 |
< |
/* iterate to improve interpolation accuracy */ |
365 |
< |
itera = (RBFVAL *)malloc(sizeof(RBFVAL)*newnode->nrbf); |
366 |
< |
if (itera == NULL) |
367 |
< |
goto memerr; |
368 |
< |
memcpy(itera, newnode->rbfa, sizeof(RBFVAL)*newnode->nrbf); |
369 |
< |
do { |
370 |
< |
double dsum = 0, dsum2 = 0; |
371 |
< |
nn = 0; |
372 |
< |
for (i = 0; i < GRIDRES; i++) |
373 |
< |
for (j = 0; j < GRIDRES; j++) |
374 |
< |
if (dsf_grid[i][j].nval) { |
375 |
< |
FVECT odir; |
376 |
< |
double corr; |
377 |
< |
ovec_from_pos(odir, i, j); |
378 |
< |
itera[nn++].peak *= corr = |
379 |
< |
dsf_grid[i][j].vsum / |
380 |
< |
eval_rbfrep(newnode, odir); |
381 |
< |
dsum += 1. - corr; |
382 |
< |
dsum2 += (1.-corr)*(1.-corr); |
383 |
< |
} |
384 |
< |
memcpy(newnode->rbfa, itera, sizeof(RBFVAL)*newnode->nrbf); |
385 |
< |
lastVar = thisVar; |
386 |
< |
thisVar = dsum2/(double)nn; |
387 |
< |
#ifdef DEBUG |
388 |
< |
fprintf(stderr, "Avg., RMS error: %.1f%% %.1f%%\n", |
389 |
< |
100.*dsum/(double)nn, |
390 |
< |
100.*sqrt(thisVar)); |
391 |
< |
#endif |
392 |
< |
} while (--niter > 0 && lastVar-thisVar > 0.02*lastVar); |
393 |
< |
|
394 |
< |
free(itera); |
395 |
< |
nn = 0; /* compute sum for normalization */ |
396 |
< |
while (nn < newnode->nrbf) |
397 |
< |
newnode->vtotal += rbf_volume(&newnode->rbfa[nn++]); |
398 |
< |
#ifdef DEBUG |
267 |
> |
fprintf(stderr, "Built RBF with %d lobes\n", newnode->nrbf); |
268 |
|
fprintf(stderr, "Integrated DSF at (%.1f,%.1f) deg. is %.2f\n", |
269 |
|
get_theta180(newnode->invec), get_phi360(newnode->invec), |
270 |
|
newnode->vtotal); |