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.6 by greg, Thu Jul 11 16:25:58 1991 UTC vs.
Revision 2.10 by greg, Wed Apr 5 06:22:56 2006 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   * Anticorrelated random function due to Christophe Schlick
6   */
7  
8 + #include "copyright.h"
9 +
10 + #include  <stdlib.h>
11 +
12 + #include  "standard.h"
13   #include  "random.h"
14  
15 < #define  NULL           0
15 > #undef initurand
16  
17 < extern char  *malloc();
17 > #define  MAXORDER       (8*sizeof(unsigned short))
18  
19 < short  *urperm;         /* urand() permutation */
18 < int  urmask;            /* bits used in permutation */
19 > static unsigned short  empty_tab = 0;
20  
21 + unsigned short  *urperm = &empty_tab;   /* urand() permutation */
22 + int  urmask = 0;                        /* bits used in permutation */
23  
24 + int
25   initurand(size)         /* initialize urand() for size entries */
26   int  size;
27   {
28          int  order, n;
29          register int  i, offset;
30  
31 <        size--;
32 <        for (i = 1; size >>= 1; i++)
33 <                ;
31 >        if ((urperm != NULL) & (urperm != &empty_tab))
32 >                free((void *)urperm);
33 >        if (--size <= 0) {
34 >                empty_tab = 0;
35 >                urperm = &empty_tab;
36 >                urmask = 0;
37 >                return(0);
38 >        }
39 >        for (i = 1; (size >>= 1); i++)
40 >                if (i == MAXORDER)
41 >                        break;
42          order = i;
43 <        urmask = (1<<i) - 1;
44 <        urperm = (short *)malloc((urmask+1)*sizeof(short));
43 >        urmask = (1<<order) - 1;
44 >        urperm = (unsigned short *)malloc((urmask+1)*sizeof(unsigned short));
45          if (urperm == NULL) {
46                  eputs("out of memory in initurand\n");
47                  quit(1);
# Line 37 | Line 49 | int  size;
49          urperm[0] = 0;
50          for (n = 1, offset = 1; n <= order; n++, offset <<= 1)
51                  for (i = offset; i--; ) {
52 <                        urperm[i] =
41 <                        urperm[i+offset] = 2*urperm[i];
52 >                        urperm[i+offset] = urperm[i] <<= 1;
53                          if (random() & 0x4000)
54                                  urperm[i]++;
55                          else
56                                  urperm[i+offset]++;
57                  }
58 +        return(urmask+1);
59   }
60  
61  
# Line 52 | Line 64 | ilhash(d, n)                   /* hash a set of integer values */
64   register int  *d;
65   register int  n;
66   {
67 <        static int  tab[8] = {13623,353,1637,5831,2314,3887,5832,8737};
67 >        static int  tab[8] = {103699,96289,73771,65203,81119,87037,92051,98899};
68          register int  hval;
69  
70          hval = 0;
71          while (n-- > 0)
72 <                hval += *d++ * tab[n&7];
73 <        return(hval);
62 < }
63 <
64 <
65 < static char  bctab[256] = {
66 <                0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4,
67 <                1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5,
68 <                1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5,
69 <                2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
70 <                1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5,
71 <                2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
72 <                2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
73 <                3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7,
74 <                1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5,
75 <                2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
76 <                2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
77 <                3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7,
78 <                2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
79 <                3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7,
80 <                3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7,
81 <                4, 5, 5, 6, 5, 6, 6, 7, 5, 6, 6, 7, 6, 7, 7, 8,
82 <        };
83 <
84 <
85 < #define NBITS           32
86 <
87 < #if NBITS==32
88 < #define  bitcount(i)    (bctab[(i)>>24&0xff]+bctab[(i)>>16&0xff]+ \
89 <                                bctab[(i)>>8&0xff]+bctab[(i)&0xff])
90 < #endif
91 < #if  NBITS==16
92 < #define  bitcount(i)    (bctab[(i)>>8&0xff]+bctab[(i)&0xff])
93 < #endif
94 <
95 <
96 < int
97 < urind(s, i)                     /* compute i'th index from seed s */
98 < int     s, i;
99 < {
100 <        register int  ss, k;
101 <        int  left;
102 <
103 <        ss = s*1103515245 + 12345;
104 <        left = 0;
105 <        for (k = i/NBITS; k--; ) {
106 <                left += bitcount(ss);
107 <                ss = ss*1103515245 + 12345;
108 <        }
109 <        for (k = i&(NBITS-1); k--; ss >>= 1)
110 <                left += ss & 1;
111 <        if (ss & 1)
112 <                return(s-left-1);
113 <        return(s-left+i);
72 >                hval ^= *d++ * tab[n&7];
73 >        return(hval & 0x7fffffff);
74   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines