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.8 by greg, Fri May 14 20:49:13 2004 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 */
19 > unsigned short  *urperm = NULL; /* urand() permutation */
20   int  urmask;            /* bits used in permutation */
21  
22 <
22 > int
23   initurand(size)         /* initialize urand() for size entries */
24   int  size;
25   {
26          int  order, n;
27          register int  i, offset;
28  
29 <        size--;
30 <        for (i = 1; size >>= 1; i++)
31 <                ;
29 >        if (urperm != NULL)
30 >                free((void *)urperm);
31 >        if (--size <= 0) {
32 >                urperm = NULL;
33 >                urmask = 0;
34 >                return(0);
35 >        }
36 >        for (i = 1; (size >>= 1); i++)
37 >                if (i == MAXORDER)
38 >                        break;
39          order = i;
40 <        urmask = (1<<i) - 1;
41 <        urperm = (short *)malloc((urmask+1)*sizeof(short));
40 >        urmask = (1<<order) - 1;
41 >        urperm = (unsigned short *)malloc((urmask+1)*sizeof(unsigned short));
42          if (urperm == NULL) {
43                  eputs("out of memory in initurand\n");
44                  quit(1);
45          }
46 <        urperm[0] = 0;
46 >        urperm[0] = (random() & 0x4000) != 0;
47          for (n = 1, offset = 1; n <= order; n++, offset <<= 1)
48                  for (i = offset; i--; ) {
49 <                        urperm[i] =
41 <                        urperm[i+offset] = 2*urperm[i];
49 >                        urperm[i+offset] = urperm[i] <<= 1;
50                          if (random() & 0x4000)
51                                  urperm[i]++;
52                          else
53                                  urperm[i+offset]++;
54                  }
55 +        return(urmask+1);
56   }
57  
58  
# Line 59 | Line 68 | register int  n;
68          while (n-- > 0)
69                  hval += *d++ * tab[n&7];
70          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);
71   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines