7 |
|
/* |
8 |
|
* Compute Glare Index given by program name: |
9 |
|
* |
10 |
< |
* gnuth_dgr - Gnuth discomfort glare rating |
11 |
< |
* gnuth_vcp - Gnuth visual comfort probability |
10 |
> |
* guth_dgr - Guth discomfort glare rating |
11 |
> |
* guth_vcp - Guth visual comfort probability |
12 |
|
* |
13 |
|
* 12 April 1991 Greg Ward EPFL |
14 |
|
*/ |
21 |
|
double posindex(); |
22 |
|
int headline(); |
23 |
|
|
24 |
< |
double direct(), gnuth_dgr(), gnuth_vcp(); |
24 |
> |
double direct(), guth_dgr(), guth_vcp(); |
25 |
|
|
26 |
|
struct named_func { |
27 |
|
char *name; |
28 |
|
double (*func)(); |
29 |
|
} all_funcs[] = { |
30 |
|
{"direct", direct}, |
31 |
< |
{"gnuth_dgr", gnuth_dgr}, |
32 |
< |
{"gnuth_vcp", gnuth_vcp}, |
31 |
> |
{"guth_dgr", guth_dgr}, |
32 |
> |
{"guth_vcp", guth_vcp}, |
33 |
|
{NULL} |
34 |
|
}; |
35 |
|
|
155 |
|
&gs->dir[0], &gs->dir[1], &gs->dir[2], |
156 |
|
&gs->dom, &gs->lum) != 5) |
157 |
|
goto readerr; |
158 |
+ |
normalize(gs->dir); |
159 |
|
gs->next = all_srcs; |
160 |
|
all_srcs = gs; |
161 |
|
break; |
248 |
|
|
249 |
|
|
250 |
|
double |
251 |
< |
gnuth_dgr(gd) /* compute Gnuth discomfort glare rating */ |
251 |
> |
guth_dgr(gd) /* compute Guth discomfort glare rating */ |
252 |
|
struct glare_dir *gd; |
253 |
|
{ |
254 |
|
#define q(w) (20.4*w+1.52*pow(w,.2)-.075) |
285 |
|
|
286 |
|
|
287 |
|
double |
288 |
< |
gnuth_vcp(gd) /* compute Gnuth visual comfort probability */ |
288 |
> |
guth_vcp(gd) /* compute Guth visual comfort probability */ |
289 |
|
struct glare_dir *gd; |
290 |
|
{ |
291 |
< |
return(100.*norm_integral(-6.374+1.3227*log(gnuth_dgr(gd)))); |
291 |
> |
return(100.*norm_integral(-6.374+1.3227*log(guth_dgr(gd)))); |
292 |
|
} |