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.27 by greg, Mon Sep 27 23:30:53 2021 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 (fptr == NULL)
154 +                return;                         /* nothing! */
155          if (libsize >= MAXLIB) {
156              eputs("Too many library functons!\n");
157              quit(1);
158          }
159          for (lp = &library[libsize]; lp > library; lp--)
160 <            if (strcmp(lp[-1].fname, fname) > 0) {
161 <                lp[0].fname = lp[-1].fname;
162 <                lp[0].nargs = lp[-1].nargs;
204 <                lp[0].atyp = lp[-1].atyp;
205 <                lp[0].f = lp[-1].f;
206 <            } else
160 >            if (strcmp(lp[-1].fname, fname) > 0)
161 >                lp[0] = lp[-1];
162 >            else
163                  break;
164          libsize++;
165      }
166      if (fptr == NULL) {                         /* delete */
167          while (lp < &library[libsize-1]) {
168 <            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;
168 >            lp[0] = lp[1];
169              lp++;
170          }
171          libsize--;
# Line 228 | Line 181 | double  (*fptr)();
181  
182  
183   int
184 < nargum()                        /* return number of available arguments */
184 > nargum(void)                    /* return number of available arguments */
185   {
186 <    register int  n;
186 >    int  n;
187  
188      if (curact == NULL)
189          return(0);
# Line 244 | Line 197 | nargum()                       /* return number of available arguments */
197  
198  
199   double
200 < argument(n)                     /* return nth argument for active function */
248 < register int  n;
200 > argument(int n)                 /* return nth argument for active function */
201   {
202 <    register ACTIVATION  *actp = curact;
203 <    register EPNODE  *ep;
202 >    ACTIVATION  *actp = curact;
203 >    EPNODE  *ep = NULL;
204      double  aval;
205  
206 <    if (actp == NULL || --n < 0) {
206 >    if (!n)                                     /* asking for # arguments? */
207 >        return((double)nargum());
208 >
209 >    if (!actp | (--n < 0)) {
210          eputs("Bad call to argument!\n");
211          quit(1);
212      }
213 <                                                /* already computed? */
259 <    if (n < AFLAGSIZ && 1L<<n & actp->an)
213 >    if ((n < AFLAGSIZ) & actp->an >> n)         /* already computed? */
214          return(actp->ap[n]);
215  
216 <    if (actp->fun == NULL || (ep = ekid(actp->fun, n+1)) == NULL) {
216 >    if (!actp->fun || !(ep = ekid(actp->fun, n+1))) {
217          eputs(actp->name);
218          eputs(": too few arguments\n");
219          quit(1);
220      }
221 <    curact = actp->prev;                        /* pop environment */
221 >    curact = actp->prev;                        /* previous context */
222      aval = evalue(ep);                          /* compute argument */
223 <    curact = actp;                              /* push back environment */
224 <    if (n < ALISTSIZ) {                         /* save value */
223 >    curact = actp;                              /* put back calling context */
224 >    if (n < ALISTSIZ) {                         /* save value if room */
225          actp->ap[n] = aval;
226          actp->an |= 1L<<n;
227      }
# Line 276 | Line 230 | register int  n;
230  
231  
232   VARDEF *
233 < argf(n)                         /* return function def for nth argument */
280 < int  n;
233 > argf(int n)                     /* return function def for nth argument */
234   {
235 <    register ACTIVATION  *actp;
236 <    register EPNODE  *ep;
235 >    ACTIVATION  *actp;
236 >    EPNODE  *ep;
237  
238      for (actp = curact; actp != NULL; actp = actp->prev) {
239  
# Line 310 | Line 263 | badarg:
263      eputs(actp->name);
264      eputs(": argument not a function\n");
265      quit(1);
266 +        return NULL; /* pro forma return */
267   }
268  
269  
270   char *
271 < argfun(n)                       /* return function name for nth argument */
318 < int  n;
271 > argfun(int n)                   /* return function name for nth argument */
272   {
273      return(argf(n)->name);
274   }
275  
276  
277   double
278 < efunc(ep)                               /* evaluate a function */
326 < register EPNODE  *ep;
278 > efunc(EPNODE *ep)                       /* evaluate a function */
279   {
280      ACTIVATION  act;
281      double  alist[ALISTSIZ];
282      double  rval;
283 <    register VARDEF  *dp;
283 >    VARDEF  *dp;
284                                          /* push environment */
285      dp = resolve(ep->v.kid);
286      act.name = dp->name;
# Line 349 | Line 301 | register EPNODE  *ep;
301  
302  
303   LIBR *
304 < liblookup(fname)                /* look up a library function */
353 < char  *fname;
304 > liblookup(char *fname)          /* look up a library function */
305   {
306      int  upper, lower;
307 <    register int  cm, i;
307 >    int  cm, i;
308  
309      lower = 0;
310      upper = cm = libsize;
# Line 378 | Line 329 | char  *fname;
329  
330  
331   static double
332 < libfunc(fname, vp)                      /* execute library function */
333 < char  *fname;
334 < VARDEF  *vp;
332 > libfunc(                                /* execute library function */
333 >        char  *fname,
334 >        VARDEF  *vp
335 > )
336   {
337 <    register LIBR  *lp;
337 >    LIBR  *lp;
338      double  d;
339      int  lasterrno;
340  
# Line 398 | Line 350 | VARDEF  *vp;
350      lasterrno = errno;
351      errno = 0;
352      d = (*lp->f)(lp->fname);
353 < #ifdef  IEEE
354 <    if (errno == 0)
353 > #ifdef  isnan
354 >    if (errno == 0) {
355          if (isnan(d))
356              errno = EDOM;
357          else if (isinf(d))
358              errno = ERANGE;
359 +    }
360   #endif
361 <    if (errno) {
361 >    if (errno == EDOM || errno == ERANGE) {
362          wputs(fname);
363          if (errno == EDOM)
364                  wputs(": domain error\n");
# Line 426 | Line 379 | VARDEF  *vp;
379  
380  
381   static double
382 < l_if()                  /* if(cond, then, else) conditional expression */
382 > l_if(char *nm)          /* if(cond, then, else) conditional expression */
383                          /* cond evaluates true if greater than zero */
384   {
385      if (argument(1) > 0.0)
# Line 437 | Line 390 | l_if()                 /* if(cond, then, else) conditional expressio
390  
391  
392   static double
393 < l_select()              /* return argument #(A1+1) */
393 > l_select(char *nm)      /* return argument #(A1+1) */
394   {
395 <        register int  n;
395 >        int     narg = nargum();
396 >        double  a1 = argument(1);
397 >        int  n = (int)(a1 + .5);
398  
399 <        n = argument(1) + .5;
445 <        if (n == 0)
446 <                return(nargum()-1);
447 <        if (n < 1 || n > nargum()-1) {
399 >        if (a1 < -.5 || n >= narg) {
400                  errno = EDOM;
401                  return(0.0);
402          }
403 +        if (!n)         /* asking max index? */
404 +                return(narg-1);
405          return(argument(n+1));
406   }
407  
408  
409   static double
410 < l_rand()                /* random function between 0 and 1 */
410 > l_max(char *nm)         /* general maximum function */
411   {
412 +        int  n = nargum();
413 +        double  vmax = argument(1);
414 +
415 +        while (n > 1) {
416 +                double  v = argument(n--);
417 +                if (vmax < v)
418 +                        vmax = v;
419 +        }
420 +        return(vmax);
421 + }
422 +
423 +
424 + static double
425 + l_min(char *nm)         /* general minimum function */
426 + {
427 +        int  n = nargum();
428 +        double  vmin = argument(1);
429 +
430 +        while (n > 1) {
431 +                double  v = argument(n--);
432 +                if (vmin > v)
433 +                        vmin = v;
434 +        }
435 +        return(vmin);
436 + }
437 +
438 +
439 + static double
440 + l_rand(char *nm)                /* random function between 0 and 1 */
441 + {
442      double  x;
443  
444      x = argument(1);
# Line 466 | Line 450 | l_rand()               /* random function between 0 and 1 */
450  
451  
452   static double
453 < l_floor()               /* return largest integer not greater than arg1 */
453 > l_floor(char *nm)               /* return largest integer not greater than arg1 */
454   {
455      return(floor(argument(1)));
456   }
457  
458  
459   static double
460 < l_ceil()                /* return smallest integer not less than arg1 */
460 > l_ceil(char *nm)                /* return smallest integer not less than arg1 */
461   {
462      return(ceil(argument(1)));
463   }
464  
465  
466   static double
467 < l_sqrt()
467 > l_sqrt(char *nm)
468   {
469      return(sqrt(argument(1)));
470   }
471  
472  
473   static double
474 < l_sin()
474 > l_sin(char *nm)
475   {
476      return(sin(argument(1)));
477   }
478  
479  
480   static double
481 < l_cos()
481 > l_cos(char *nm)
482   {
483      return(cos(argument(1)));
484   }
485  
486  
487   static double
488 < l_tan()
488 > l_tan(char *nm)
489   {
490      return(tan(argument(1)));
491   }
492  
493  
494   static double
495 < l_asin()
495 > l_asin(char *nm)
496   {
497      return(asin(argument(1)));
498   }
499  
500  
501   static double
502 < l_acos()
502 > l_acos(char *nm)
503   {
504      return(acos(argument(1)));
505   }
506  
507  
508   static double
509 < l_atan()
509 > l_atan(char *nm)
510   {
511      return(atan(argument(1)));
512   }
513  
514  
515   static double
516 < l_atan2()
516 > l_atan2(char *nm)
517   {
518      return(atan2(argument(1), argument(2)));
519   }
520  
521  
522   static double
523 < l_exp()
523 > l_exp(char *nm)
524   {
525      return(exp(argument(1)));
526   }
527  
528  
529   static double
530 < l_log()
530 > l_log(char *nm)
531   {
532      return(log(argument(1)));
533   }
534  
535  
536   static double
537 < l_log10()
537 > l_log10(char *nm)
538   {
539      return(log10(argument(1)));
540   }

Diff Legend

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