ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/common/calfunc.c
(Generate patch)

Comparing ray/src/common/calfunc.c (file contents):
Revision 2.8 by greg, Sat Feb 22 02:07:21 2003 UTC vs.
Revision 2.22 by greg, Mon Jun 10 16:52:27 2019 UTC

# Line 10 | Line 10 | static const char      RCSid[] = "$Id$";
10   *  2/19/03     Eliminated conditional compiles in favor of esupport extern.
11   */
12  
13 < /* ====================================================================
14 < * The Radiance Software License, Version 1.0
15 < *
16 < * Copyright (c) 1990 - 2002 The Regents of the University of California,
17 < * through Lawrence Berkeley National Laboratory.   All rights reserved.
18 < *
19 < * Redistribution and use in source and binary forms, with or without
20 < * modification, are permitted provided that the following conditions
21 < * are met:
22 < *
23 < * 1. Redistributions of source code must retain the above copyright
24 < *         notice, this list of conditions and the following disclaimer.
25 < *
26 < * 2. Redistributions in binary form must reproduce the above copyright
27 < *       notice, this list of conditions and the following disclaimer in
28 < *       the documentation and/or other materials provided with the
29 < *       distribution.
30 < *
31 < * 3. The end-user documentation included with the redistribution,
32 < *           if any, must include the following acknowledgment:
33 < *             "This product includes Radiance software
34 < *                 (http://radsite.lbl.gov/)
35 < *                 developed by the Lawrence Berkeley National Laboratory
36 < *               (http://www.lbl.gov/)."
37 < *       Alternately, this acknowledgment may appear in the software itself,
38 < *       if and wherever such third-party acknowledgments normally appear.
39 < *
40 < * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
41 < *       and "The Regents of the University of California" must
42 < *       not be used to endorse or promote products derived from this
43 < *       software without prior written permission. For written
44 < *       permission, please contact [email protected].
45 < *
46 < * 5. Products derived from this software may not be called "Radiance",
47 < *       nor may "Radiance" appear in their name, without prior written
48 < *       permission of Lawrence Berkeley National Laboratory.
49 < *
50 < * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
51 < * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
52 < * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
53 < * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
54 < * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
55 < * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
56 < * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
57 < * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
58 < * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
59 < * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
60 < * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
61 < * SUCH DAMAGE.
62 < * ====================================================================
63 < *
64 < * This software consists of voluntary contributions made by many
65 < * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
66 < * information on Lawrence Berkeley National Laboratory, please see
67 < * <http://www.lbl.gov/>.
68 < */
13 > #include "copyright.h"
14  
15   #include  <stdio.h>
16 <
16 > #include  <string.h>
17   #include  <errno.h>
73 –
18   #include  <math.h>
19  
20 + #include  "rterror.h"
21   #include  "calcomp.h"
22  
23                                  /* bits in argument flag (better be right!) */
24   #define  AFLAGSIZ       (8*sizeof(unsigned long))
25 < #define  ALISTSIZ       6       /* maximum saved argument list */
25 > #define  ALISTSIZ       8       /* maximum saved argument list */
26  
27   typedef struct activation {
28      char  *name;                /* function name */
# Line 89 | Line 34 | typedef struct activation {
34  
35   static ACTIVATION  *curact = NULL;
36  
37 < static double  libfunc();
37 > static double  libfunc(char *fname, VARDEF *vp);
38  
39   #ifndef  MAXLIB
40   #define  MAXLIB         64      /* maximum number of library functions */
41   #endif
42  
43 < static double  l_if(), l_select(), l_rand();
44 < static double  l_floor(), l_ceil();
45 < static double  l_sqrt();
46 < static double  l_sin(), l_cos(), l_tan();
47 < static double  l_asin(), l_acos(), l_atan(), l_atan2();
48 < static double  l_exp(), l_log(), l_log10();
43 > static double  l_if(char *), l_select(char *);
44 > static double  l_min(char *), l_max(char *);
45 > static double  l_rand(char *);
46 > static double  l_floor(char *), l_ceil(char *);
47 > static double  l_sqrt(char *);
48 > static double  l_sin(char *), l_cos(char *), l_tan(char *);
49 > static double  l_asin(char *), l_acos(char *), l_atan(char *), l_atan2(char *);
50 > static double  l_exp(char *), l_log(char *), l_log10(char *);
51  
52                          /* functions must be listed alphabetically */
53   static LIBR  library[MAXLIB] = {
# Line 115 | Line 62 | static LIBR  library[MAXLIB] = {
62      { "if", 3, ':', l_if },
63      { "log", 1, ':', l_log },
64      { "log10", 1, ':', l_log10 },
65 +    { "max", 1, ':', l_max },
66 +    { "min", 1, ':', l_min },
67      { "rand", 1, ':', l_rand },
68      { "select", 1, ':', l_select },
69      { "sin", 1, ':', l_sin },
# Line 122 | Line 71 | static LIBR  library[MAXLIB] = {
71      { "tan", 1, ':', l_tan },
72   };
73  
74 < static int  libsize = 16;
74 > static int  libsize = 18;
75  
76   #define  resolve(ep)    ((ep)->type==VAR?(ep)->v.ln:argf((ep)->v.chan))
77  
78  
79   int
80 < fundefined(fname)               /* return # of arguments for function */
81 < char  *fname;
80 > fundefined(                     /* return # of req'd arguments for function */
81 >        char  *fname
82 > )
83   {
84 <    register LIBR  *lp;
85 <    register VARDEF  *vp;
84 >    LIBR  *lp;
85 >    VARDEF  *vp;
86  
87      if ((vp = varlookup(fname)) != NULL && vp->def != NULL
88                  && vp->def->v.kid->type == FUNC)
# Line 145 | Line 95 | char  *fname;
95  
96  
97   double
98 < funvalue(fname, n, a)           /* return a function value to the user */
99 < char  *fname;
100 < int  n;
101 < double  *a;
98 > funvalue(                       /* return a function value to the user */
99 >        char  *fname,
100 >        int  n,
101 >        double  *a
102 > )
103   {
104      ACTIVATION  act;
105 <    register VARDEF  *vp;
105 >    VARDEF  *vp;
106      double  rval;
107                                          /* push environment */
108      act.name = fname;
109      act.prev = curact;
110      act.ap = a;
111 <    if (n >= AFLAGSIZ)
161 <        act.an = ~0;
162 <    else
111 >    if (n < AFLAGSIZ)
112          act.an = (1L<<n)-1;
113 +    else {
114 +        act.an = ~0;
115 +        if (n > AFLAGSIZ)
116 +            wputs("Excess arguments in funvalue()\n");
117 +    }
118      act.fun = NULL;
119      curact = &act;
120  
# Line 176 | Line 130 | double  *a;
130  
131  
132   void
133 < funset(fname, nargs, assign, fptr)      /* set a library function */
134 < char  *fname;
135 < int  nargs;
136 < int  assign;
137 < double  (*fptr)();
133 > funset(                         /* set a library function */
134 >        char  *fname,
135 >        int  nargs,
136 >        int  assign,
137 >        double  (*fptr)(char *)
138 > )
139   {
140      int  oldlibsize = libsize;
141      char *cp;
142 <    register LIBR  *lp;
142 >    LIBR  *lp;
143                                                  /* check for context */
144      for (cp = fname; *cp; cp++)
145          ;
146      if (cp == fname)
147          return;
148 <    if (cp[-1] == CNTXMARK)
148 >    while (cp[-1] == CNTXMARK) {
149          *--cp = '\0';
150 +        if (cp == fname) return;
151 +    }
152      if ((lp = liblookup(fname)) == NULL) {      /* insert */
153          if (libsize >= MAXLIB) {
154              eputs("Too many library functons!\n");
155              quit(1);
156          }
157          for (lp = &library[libsize]; lp > library; lp--)
158 <            if (strcmp(lp[-1].fname, fname) > 0) {
159 <                lp[0].fname = lp[-1].fname;
160 <                lp[0].nargs = lp[-1].nargs;
204 <                lp[0].atyp = lp[-1].atyp;
205 <                lp[0].f = lp[-1].f;
206 <            } else
158 >            if (strcmp(lp[-1].fname, fname) > 0)
159 >                lp[0] = lp[-1];
160 >            else
161                  break;
162          libsize++;
163      }
164      if (fptr == NULL) {                         /* delete */
165          while (lp < &library[libsize-1]) {
166 <            lp[0].fname = lp[1].fname;
213 <            lp[0].nargs = lp[1].nargs;
214 <            lp[0].atyp = lp[1].atyp;
215 <            lp[0].f = lp[1].f;
166 >            lp[0] = lp[1];
167              lp++;
168          }
169          libsize--;
# Line 228 | Line 179 | double  (*fptr)();
179  
180  
181   int
182 < nargum()                        /* return number of available arguments */
182 > nargum(void)                    /* return number of available arguments */
183   {
184 <    register int  n;
184 >    int  n;
185  
186      if (curact == NULL)
187          return(0);
# Line 244 | Line 195 | nargum()                       /* return number of available arguments */
195  
196  
197   double
198 < argument(n)                     /* return nth argument for active function */
248 < register int  n;
198 > argument(int n)                 /* return nth argument for active function */
199   {
200 <    register ACTIVATION  *actp = curact;
201 <    register EPNODE  *ep;
200 >    ACTIVATION  *actp = curact;
201 >    EPNODE  *ep = NULL;
202      double  aval;
203  
204 <    if (actp == NULL || --n < 0) {
204 >    if (!n)                                     /* asking for # arguments? */
205 >        return((double)nargum());
206 >
207 >    if (!actp | (--n < 0)) {
208          eputs("Bad call to argument!\n");
209          quit(1);
210      }
211 <                                                /* already computed? */
259 <    if (n < AFLAGSIZ && 1L<<n & actp->an)
211 >    if ((n < AFLAGSIZ) & actp->an >> n)         /* already computed? */
212          return(actp->ap[n]);
213  
214 <    if (actp->fun == NULL || (ep = ekid(actp->fun, n+1)) == NULL) {
214 >    if (!actp->fun || !(ep = ekid(actp->fun, n+1))) {
215          eputs(actp->name);
216          eputs(": too few arguments\n");
217          quit(1);
218      }
219 <    curact = actp->prev;                        /* pop environment */
219 >    curact = actp->prev;                        /* previous context */
220      aval = evalue(ep);                          /* compute argument */
221 <    curact = actp;                              /* push back environment */
222 <    if (n < ALISTSIZ) {                         /* save value */
221 >    curact = actp;                              /* put back calling context */
222 >    if (n < ALISTSIZ) {                         /* save value if room */
223          actp->ap[n] = aval;
224          actp->an |= 1L<<n;
225      }
# Line 276 | Line 228 | register int  n;
228  
229  
230   VARDEF *
231 < argf(n)                         /* return function def for nth argument */
280 < int  n;
231 > argf(int n)                     /* return function def for nth argument */
232   {
233 <    register ACTIVATION  *actp;
234 <    register EPNODE  *ep;
233 >    ACTIVATION  *actp;
234 >    EPNODE  *ep;
235  
236      for (actp = curact; actp != NULL; actp = actp->prev) {
237  
# Line 310 | Line 261 | badarg:
261      eputs(actp->name);
262      eputs(": argument not a function\n");
263      quit(1);
264 +        return NULL; /* pro forma return */
265   }
266  
267  
268   char *
269 < argfun(n)                       /* return function name for nth argument */
318 < int  n;
269 > argfun(int n)                   /* return function name for nth argument */
270   {
271      return(argf(n)->name);
272   }
273  
274  
275   double
276 < efunc(ep)                               /* evaluate a function */
326 < register EPNODE  *ep;
276 > efunc(EPNODE *ep)                       /* evaluate a function */
277   {
278      ACTIVATION  act;
279      double  alist[ALISTSIZ];
280      double  rval;
281 <    register VARDEF  *dp;
281 >    VARDEF  *dp;
282                                          /* push environment */
283      dp = resolve(ep->v.kid);
284      act.name = dp->name;
# Line 349 | Line 299 | register EPNODE  *ep;
299  
300  
301   LIBR *
302 < liblookup(fname)                /* look up a library function */
353 < char  *fname;
302 > liblookup(char *fname)          /* look up a library function */
303   {
304      int  upper, lower;
305 <    register int  cm, i;
305 >    int  cm, i;
306  
307      lower = 0;
308      upper = cm = libsize;
# Line 378 | Line 327 | char  *fname;
327  
328  
329   static double
330 < libfunc(fname, vp)                      /* execute library function */
331 < char  *fname;
332 < VARDEF  *vp;
330 > libfunc(                                /* execute library function */
331 >        char  *fname,
332 >        VARDEF  *vp
333 > )
334   {
335 <    register LIBR  *lp;
335 >    LIBR  *lp;
336      double  d;
337      int  lasterrno;
338  
# Line 398 | Line 348 | VARDEF  *vp;
348      lasterrno = errno;
349      errno = 0;
350      d = (*lp->f)(lp->fname);
351 < #ifdef  IEEE
352 <    if (errno == 0)
351 > #ifdef  isnan
352 >    if (errno == 0) {
353          if (isnan(d))
354              errno = EDOM;
355          else if (isinf(d))
356              errno = ERANGE;
357 +    }
358   #endif
359 <    if (errno) {
359 >    if (errno == EDOM || errno == ERANGE) {
360          wputs(fname);
361          if (errno == EDOM)
362                  wputs(": domain error\n");
# Line 426 | Line 377 | VARDEF  *vp;
377  
378  
379   static double
380 < l_if()                  /* if(cond, then, else) conditional expression */
380 > l_if(char *nm)          /* if(cond, then, else) conditional expression */
381                          /* cond evaluates true if greater than zero */
382   {
383      if (argument(1) > 0.0)
# Line 437 | Line 388 | l_if()                 /* if(cond, then, else) conditional expressio
388  
389  
390   static double
391 < l_select()              /* return argument #(A1+1) */
391 > l_select(char *nm)      /* return argument #(A1+1) */
392   {
393 <        register int  n;
393 >        int  n;
394  
395 <        n = argument(1) + .5;
395 >        n = (int)(argument(1) + .5);
396          if (n == 0)
397                  return(nargum()-1);
398          if (n < 1 || n > nargum()-1) {
# Line 453 | Line 404 | l_select()             /* return argument #(A1+1) */
404  
405  
406   static double
407 < l_rand()                /* random function between 0 and 1 */
407 > l_max(char *nm)         /* general maximum function */
408   {
409 +        int  n = nargum();
410 +        int  i = 1;
411 +        int  vmax = argument(1);
412 +
413 +        while (i++ < n) {
414 +                double  v = argument(i);
415 +                if (vmax < v)
416 +                        vmax = v;
417 +        }
418 +        return(vmax);
419 + }
420 +
421 +
422 + static double
423 + l_min(char *nm)         /* general minimum function */
424 + {
425 +        int  n = nargum();
426 +        int  i = 1;
427 +        int  vmin = argument(1);
428 +
429 +        while (i++ < n) {
430 +                double  v = argument(i);
431 +                if (vmin > v)
432 +                        vmin = v;
433 +        }
434 +        return(vmin);
435 + }
436 +
437 +
438 + static double
439 + l_rand(char *nm)                /* random function between 0 and 1 */
440 + {
441      double  x;
442  
443      x = argument(1);
# Line 466 | Line 449 | l_rand()               /* random function between 0 and 1 */
449  
450  
451   static double
452 < l_floor()               /* return largest integer not greater than arg1 */
452 > l_floor(char *nm)               /* return largest integer not greater than arg1 */
453   {
454      return(floor(argument(1)));
455   }
456  
457  
458   static double
459 < l_ceil()                /* return smallest integer not less than arg1 */
459 > l_ceil(char *nm)                /* return smallest integer not less than arg1 */
460   {
461      return(ceil(argument(1)));
462   }
463  
464  
465   static double
466 < l_sqrt()
466 > l_sqrt(char *nm)
467   {
468      return(sqrt(argument(1)));
469   }
470  
471  
472   static double
473 < l_sin()
473 > l_sin(char *nm)
474   {
475      return(sin(argument(1)));
476   }
477  
478  
479   static double
480 < l_cos()
480 > l_cos(char *nm)
481   {
482      return(cos(argument(1)));
483   }
484  
485  
486   static double
487 < l_tan()
487 > l_tan(char *nm)
488   {
489      return(tan(argument(1)));
490   }
491  
492  
493   static double
494 < l_asin()
494 > l_asin(char *nm)
495   {
496      return(asin(argument(1)));
497   }
498  
499  
500   static double
501 < l_acos()
501 > l_acos(char *nm)
502   {
503      return(acos(argument(1)));
504   }
505  
506  
507   static double
508 < l_atan()
508 > l_atan(char *nm)
509   {
510      return(atan(argument(1)));
511   }
512  
513  
514   static double
515 < l_atan2()
515 > l_atan2(char *nm)
516   {
517      return(atan2(argument(1), argument(2)));
518   }
519  
520  
521   static double
522 < l_exp()
522 > l_exp(char *nm)
523   {
524      return(exp(argument(1)));
525   }
526  
527  
528   static double
529 < l_log()
529 > l_log(char *nm)
530   {
531      return(log(argument(1)));
532   }
533  
534  
535   static double
536 < l_log10()
536 > l_log10(char *nm)
537   {
538      return(log10(argument(1)));
539   }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines