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.32 by greg, Mon Sep 16 17:31:14 2024 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>
18 <
18 > #include  <stdlib.h>
19   #include  <math.h>
20  
21 + #include  "rterror.h"
22   #include  "calcomp.h"
23  
24                                  /* bits in argument flag (better be right!) */
25   #define  AFLAGSIZ       (8*sizeof(unsigned long))
26 < #define  ALISTSIZ       6       /* maximum saved argument list */
26 > #define  ALISTSIZ       10      /* maximum saved argument list */
27  
28   typedef struct activation {
29      char  *name;                /* function name */
# Line 89 | Line 35 | typedef struct activation {
35  
36   static ACTIVATION  *curact = NULL;
37  
38 < static double  libfunc();
38 > static double  libfunc(char *fname, VARDEF *vp);
39  
40   #ifndef  MAXLIB
41   #define  MAXLIB         64      /* maximum number of library functions */
42   #endif
43  
44 < static double  l_if(), l_select(), l_rand();
45 < static double  l_floor(), l_ceil();
46 < static double  l_sqrt();
47 < static double  l_sin(), l_cos(), l_tan();
48 < static double  l_asin(), l_acos(), l_atan(), l_atan2();
49 < static double  l_exp(), l_log(), l_log10();
44 > static double  l_if(char *), l_select(char *);
45 > static double  l_min(char *), l_max(char *);
46 > static double  l_rand(char *);
47 > static double  l_floor(char *), l_ceil(char *);
48 > static double  l_sqrt(char *);
49 > static double  l_sin(char *), l_cos(char *), l_tan(char *);
50 > static double  l_asin(char *), l_acos(char *), l_atan(char *), l_atan2(char *);
51 > static double  l_exp(char *), l_log(char *), l_log10(char *);
52  
53                          /* functions must be listed alphabetically */
54 < static LIBR  library[MAXLIB] = {
54 > static ELIBR  library[MAXLIB] = {
55      { "acos", 1, ':', l_acos },
56      { "asin", 1, ':', l_asin },
57      { "atan", 1, ':', l_atan },
# Line 115 | Line 63 | static LIBR  library[MAXLIB] = {
63      { "if", 3, ':', l_if },
64      { "log", 1, ':', l_log },
65      { "log10", 1, ':', l_log10 },
66 +    { "max", 1, ':', l_max },
67 +    { "min", 1, ':', l_min },
68      { "rand", 1, ':', l_rand },
69      { "select", 1, ':', l_select },
70      { "sin", 1, ':', l_sin },
# Line 122 | Line 72 | static LIBR  library[MAXLIB] = {
72      { "tan", 1, ':', l_tan },
73   };
74  
75 < static int  libsize = 16;
75 > static int  libsize = 18;
76  
77 < #define  resolve(ep)    ((ep)->type==VAR?(ep)->v.ln:argf((ep)->v.chan))
77 > #define  resolve(ep)    ((ep)->type==VAR?(ep)->v.ln:eargf((ep)->v.chan))
78  
79  
80   int
81 < fundefined(fname)               /* return # of arguments for function */
82 < char  *fname;
81 > fundefined(                     /* return # of req'd arguments for function */
82 >        char  *fname
83 > )
84   {
85 <    register LIBR  *lp;
86 <    register VARDEF  *vp;
85 >    ELIBR  *lp;
86 >    VARDEF  *vp;
87  
88      if ((vp = varlookup(fname)) != NULL && vp->def != NULL
89                  && vp->def->v.kid->type == FUNC)
90          return(nekids(vp->def->v.kid) - 1);
91 <    lp = vp != NULL ? vp->lib : liblookup(fname);
91 >    lp = vp != NULL ? vp->lib : eliblookup(fname);
92      if (lp == NULL)
93          return(0);
94      return(lp->nargs);
# Line 145 | Line 96 | char  *fname;
96  
97  
98   double
99 < funvalue(fname, n, a)           /* return a function value to the user */
100 < char  *fname;
101 < int  n;
102 < double  *a;
99 > funvalue(                       /* return a function value to the user */
100 >        char  *fname,
101 >        int  n,
102 >        double  *a
103 > )
104   {
105      ACTIVATION  act;
106 <    register VARDEF  *vp;
106 >    VARDEF  *vp;
107      double  rval;
108                                          /* push environment */
109      act.name = fname;
110      act.prev = curact;
111      act.ap = a;
112 <    if (n >= AFLAGSIZ)
161 <        act.an = ~0;
162 <    else
112 >    if (n < AFLAGSIZ)
113          act.an = (1L<<n)-1;
114 +    else {
115 +        act.an = ~0;
116 +        if (n > AFLAGSIZ)
117 +            wputs("Excess arguments in funvalue()\n");
118 +    }
119      act.fun = NULL;
120      curact = &act;
121  
# Line 176 | Line 131 | double  *a;
131  
132  
133   void
134 < funset(fname, nargs, assign, fptr)      /* set a library function */
135 < char  *fname;
136 < int  nargs;
137 < int  assign;
138 < double  (*fptr)();
134 > funset(                         /* set a library function */
135 >        char  *fname,
136 >        int  nargs,
137 >        int  assign,
138 >        double  (*fptr)(char *)
139 > )
140   {
141      int  oldlibsize = libsize;
142      char *cp;
143 <    register LIBR  *lp;
143 >    ELIBR  *lp;
144                                                  /* check for context */
145      for (cp = fname; *cp; cp++)
146          ;
147      if (cp == fname)
148          return;
149 <    if (cp[-1] == CNTXMARK)
149 >    while (cp[-1] == CNTXMARK) {
150          *--cp = '\0';
151 <    if ((lp = liblookup(fname)) == NULL) {      /* insert */
151 >        if (cp == fname) return;
152 >    }
153 >    if ((lp = eliblookup(fname)) == NULL) {     /* insert */
154 >        if (fptr == NULL)
155 >                return;                         /* nothing! */
156          if (libsize >= MAXLIB) {
157              eputs("Too many library functons!\n");
158              quit(1);
159          }
160          for (lp = &library[libsize]; lp > library; lp--)
161 <            if (strcmp(lp[-1].fname, fname) > 0) {
162 <                lp[0].fname = lp[-1].fname;
163 <                lp[0].nargs = lp[-1].nargs;
204 <                lp[0].atyp = lp[-1].atyp;
205 <                lp[0].f = lp[-1].f;
206 <            } else
161 >            if (strcmp(lp[-1].fname, fname) > 0)
162 >                lp[0] = lp[-1];
163 >            else
164                  break;
165          libsize++;
166      }
167      if (fptr == NULL) {                         /* delete */
168          while (lp < &library[libsize-1]) {
169 <            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;
169 >            lp[0] = lp[1];
170              lp++;
171          }
172          libsize--;
# Line 223 | Line 177 | double  (*fptr)();
177          lp[0].f = fptr;
178      }
179      if (libsize != oldlibsize)
180 <        libupdate(fname);                       /* relink library */
180 >        elibupdate(fname);                      /* relink library */
181   }
182  
183  
184   int
185 < nargum()                        /* return number of available arguments */
185 > nargum(void)                    /* return number of available arguments */
186   {
187 <    register int  n;
187 >    int  n;
188  
189      if (curact == NULL)
190          return(0);
# Line 244 | Line 198 | nargum()                       /* return number of available arguments */
198  
199  
200   double
201 < argument(n)                     /* return nth argument for active function */
248 < register int  n;
201 > argument(int n)                 /* return nth argument for active function */
202   {
203 <    register ACTIVATION  *actp = curact;
204 <    register EPNODE  *ep;
203 >    ACTIVATION  *actp = curact;
204 >    EPNODE  *ep;
205      double  aval;
206  
207 <    if (actp == NULL || --n < 0) {
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 > eargf(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 303 | Line 254 | int  n;
254  
255          n = ep->v.chan;                         /* try previous context */
256      }
257 <    eputs("Bad call to argf!\n");
257 >    eputs("Bad call to eargf!\n");
258      quit(1);
259  
260   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 > eargfun(int n)                  /* return function name for nth argument */
270   {
271 <    return(argf(n)->name);
271 >    return(eargf(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 348 | Line 298 | register EPNODE  *ep;
298   }
299  
300  
301 < LIBR *
302 < liblookup(fname)                /* look up a library function */
303 < char  *fname;
301 > double
302 > eargument(                              /* evaluate an argument */
303 >    EPNODE      *ep
304 > )
305   {
306 +    if ((ep->v.chan <= AFLAGSIZ) & curact->an >> (ep->v.chan-1))
307 +        return(curact->ap[ep->v.chan-1]);
308 +
309 +    return(argument(ep->v.chan));
310 + }
311 +
312 +
313 + ELIBR *
314 + eliblookup(char *fname)         /* look up a library function */
315 + {
316      int  upper, lower;
317 <    register int  cm, i;
317 >    int  cm, i;
318  
319      lower = 0;
320      upper = cm = libsize;
# Line 378 | Line 339 | char  *fname;
339  
340  
341   static double
342 < libfunc(fname, vp)                      /* execute library function */
343 < char  *fname;
344 < VARDEF  *vp;
342 > libfunc(                                /* execute library function */
343 >        char  *fname,
344 >        VARDEF  *vp
345 > )
346   {
347 <    register LIBR  *lp;
347 >    ELIBR  *lp;
348      double  d;
349      int  lasterrno;
350  
351      if (vp != NULL)
352          lp = vp->lib;
353      else
354 <        lp = liblookup(fname);
354 >        lp = eliblookup(fname);
355      if (lp == NULL) {
356          eputs(fname);
357          eputs(": undefined function\n");
# Line 398 | Line 360 | VARDEF  *vp;
360      lasterrno = errno;
361      errno = 0;
362      d = (*lp->f)(lp->fname);
363 < #ifdef  IEEE
364 <    if (errno == 0)
363 > #ifdef  isnan
364 >    if (errno == 0) {
365          if (isnan(d))
366              errno = EDOM;
367          else if (isinf(d))
368              errno = ERANGE;
369 +    }
370   #endif
371 <    if (errno) {
371 >    if ((errno == EDOM) | (errno == ERANGE)) {
372          wputs(fname);
373          if (errno == EDOM)
374                  wputs(": domain error\n");
# Line 426 | Line 389 | VARDEF  *vp;
389  
390  
391   static double
392 < l_if()                  /* if(cond, then, else) conditional expression */
392 > l_if(char *nm)          /* if(cond, then, else) conditional expression */
393                          /* cond evaluates true if greater than zero */
394   {
395      if (argument(1) > 0.0)
# Line 437 | Line 400 | l_if()                 /* if(cond, then, else) conditional expressio
400  
401  
402   static double
403 < l_select()              /* return argument #(A1+1) */
403 > l_select(char *nm)      /* return argument #(A1+1) */
404   {
405 <        register int  n;
405 >        int     narg = nargum();
406 >        double  a1 = argument(1);
407 >        int  n = (int)(a1 + .5);
408  
409 <        n = argument(1) + .5;
445 <        if (n == 0)
446 <                return(nargum()-1);
447 <        if (n < 1 || n > nargum()-1) {
409 >        if ((a1 < -.5) | (n >= narg)) {
410                  errno = EDOM;
411                  return(0.0);
412          }
413 +        if (!n)         /* asking max index? */
414 +                return(narg-1);
415          return(argument(n+1));
416   }
417  
418  
419   static double
420 < l_rand()                /* random function between 0 and 1 */
420 > l_max(char *nm)         /* general maximum function */
421   {
422 +        int  n = nargum();
423 +        double  vmax = argument(1);
424 +
425 +        while (n > 1) {
426 +                double  v = argument(n--);
427 +                if (vmax < v)
428 +                        vmax = v;
429 +        }
430 +        return(vmax);
431 + }
432 +
433 +
434 + static double
435 + l_min(char *nm)         /* general minimum function */
436 + {
437 +        int  n = nargum();
438 +        double  vmin = argument(1);
439 +
440 +        while (n > 1) {
441 +                double  v = argument(n--);
442 +                if (vmin > v)
443 +                        vmin = v;
444 +        }
445 +        return(vmin);
446 + }
447 +
448 +
449 + static double
450 + l_rand(char *nm)                /* random function between 0 and 1 */
451 + {
452      double  x;
453  
454      x = argument(1);
# Line 466 | Line 460 | l_rand()               /* random function between 0 and 1 */
460  
461  
462   static double
463 < l_floor()               /* return largest integer not greater than arg1 */
463 > l_floor(char *nm)               /* return largest integer not greater than arg1 */
464   {
465      return(floor(argument(1)));
466   }
467  
468  
469   static double
470 < l_ceil()                /* return smallest integer not less than arg1 */
470 > l_ceil(char *nm)                /* return smallest integer not less than arg1 */
471   {
472      return(ceil(argument(1)));
473   }
474  
475  
476   static double
477 < l_sqrt()
477 > l_sqrt(char *nm)
478   {
479      return(sqrt(argument(1)));
480   }
481  
482  
483   static double
484 < l_sin()
484 > l_sin(char *nm)
485   {
486      return(sin(argument(1)));
487   }
488  
489  
490   static double
491 < l_cos()
491 > l_cos(char *nm)
492   {
493      return(cos(argument(1)));
494   }
495  
496  
497   static double
498 < l_tan()
498 > l_tan(char *nm)
499   {
500      return(tan(argument(1)));
501   }
502  
503  
504   static double
505 < l_asin()
505 > l_asin(char *nm)
506   {
507      return(asin(argument(1)));
508   }
509  
510  
511   static double
512 < l_acos()
512 > l_acos(char *nm)
513   {
514      return(acos(argument(1)));
515   }
516  
517  
518   static double
519 < l_atan()
519 > l_atan(char *nm)
520   {
521      return(atan(argument(1)));
522   }
523  
524  
525   static double
526 < l_atan2()
526 > l_atan2(char *nm)
527   {
528      return(atan2(argument(1), argument(2)));
529   }
530  
531  
532   static double
533 < l_exp()
533 > l_exp(char *nm)
534   {
535      return(exp(argument(1)));
536   }
537  
538  
539   static double
540 < l_log()
540 > l_log(char *nm)
541   {
542      return(log(argument(1)));
543   }
544  
545  
546   static double
547 < l_log10()
547 > l_log10(char *nm)
548   {
549      return(log10(argument(1)));
550   }

Diff Legend

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