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

Comparing ray/src/common/urand.c (file contents):
Revision 1.2 by greg, Fri May 17 13:51:14 1991 UTC vs.
Revision 2.14 by greg, Thu Apr 21 15:22:30 2022 UTC

# Line 1 | Line 1
1 /* Copyright (c) 1991 Regents of the University of California */
2
1   #ifndef lint
2 < static char SCCSid[] = "$SunId$ LBL";
2 > static const char       RCSid[] = "$Id$";
3   #endif
6
4   /*
5 < * Uncorrelated (anticorrelated) random function
5 > * Anticorrelated random function due to Christophe Schlick
6   */
7  
8 + #include "copyright.h"
9 +
10 + #include  "rterror.h"
11   #include  "random.h"
12  
13 < #define  NULL           0
13 > #undef initurand
14  
15 < extern char  *malloc();
15 > #define  MAXORDER       (8*sizeof(unsigned short))
16  
17 < short  *urperm;         /* urand() permutation */
18 < int  urmask;            /* bits used in permutation */
19 < static int  urorder;    /* number of bits */
17 > static unsigned short  empty_tab = 0;
18  
19 + unsigned short  *urperm = &empty_tab;   /* urand() permutation */
20 + int  urmask = 0;                        /* bits used in permutation */
21  
22 < initurand(size)         /* initialize urand() for size entries */
23 < int  size;
22 >
23 > long
24 > irandom(                        /* better than using random() % modulus */
25 >        long modulus
26 > )
27   {
28 +        if (sizeof(long) >= 8)
29 +                return((random()*modulus)>>31);
30 +
31 +        if (sizeof(long long) >= 8)
32 +                return((random()*(long long)modulus)>>31);
33 +
34 +        return(frandom()*modulus);
35 + }
36 +
37 + int
38 + initurand(                      /* initialize urand() for size entries */
39 +        int  size
40 + )
41 + {
42          int  order, n;
43 <        register int  i, offset;
43 >        int  i, offset;
44  
45 <        size--;
46 <        for (i = 1; size >>= 1; i++)
47 <                ;
45 >        if ((urperm != NULL) & (urperm != &empty_tab))
46 >                free((void *)urperm);
47 >        if (--size <= 0) {
48 >                empty_tab = 0;
49 >                urperm = &empty_tab;
50 >                urmask = 0;
51 >                return(0);
52 >        }
53 >        for (i = 1; (size >>= 1); i++)
54 >                if (i == MAXORDER)
55 >                        break;
56          order = i;
57 <        urmask = (1<<i) - 1;
58 <        urperm = (short *)malloc((urmask+1)*sizeof(short));
57 >        urmask = (1<<order) - 1;
58 >        urperm = (unsigned short *)malloc((urmask+1)*sizeof(unsigned short));
59          if (urperm == NULL) {
60                  eputs("out of memory in initurand\n");
61                  quit(1);
# Line 38 | Line 63 | int  size;
63          urperm[0] = 0;
64          for (n = 1, offset = 1; n <= order; n++, offset <<= 1)
65                  for (i = offset; i--; ) {
66 <                        urperm[i] =
42 <                        urperm[i+offset] = 2*urperm[i];
66 >                        urperm[i+offset] = urperm[i] <<= 1;
67                          if (random() & 0x4000)
68                                  urperm[i]++;
69                          else
70                                  urperm[i+offset]++;
71                  }
72 +        return(urmask+1);
73   }
74  
75  
76   int
77 < urhash(d, n)                    /* hash a set of integer values */
78 < register int  *d;
79 < register int  n;
77 > ilhash(                         /* hash a set of integer values */
78 >        int  *d,
79 >        int  n
80 > )
81   {
82 <        static int  tab[8] = {13623,353,1637,5831,2314,3887,5832,8737};
83 <        register unsigned  hval;
82 >        static int  tab[8] = {103699,96289,73771,65203,81119,87037,92051,98899};
83 >        int  hval;
84  
85          hval = 0;
86          while (n-- > 0)
87 <                hval += *d++ * tab[n&7];
88 <        return(hval & urmask);
87 >                hval ^= *d++ * tab[n&7];
88 >        return(hval & 0x7fffffff);
89   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines