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

Comparing ray/src/common/random.h (file contents):
Revision 2.8 by greg, Sat Feb 22 02:07:22 2003 UTC vs.
Revision 2.16 by greg, Wed Apr 5 06:22:56 2006 UTC

# Line 1 | Line 1
1 < /* RCSid: $Id$ */
1 > /* RCSid $Id$ */
2   /*
3   *  random.h - header file for random(3) and urand() function.
4   */
5 + #ifndef _RAD_RANDOM_H_
6 + #define _RAD_RANDOM_H_
7 + #ifdef __cplusplus
8 + extern "C" {
9 + #endif
10  
11 < /* ====================================================================
7 < * The Radiance Software License, Version 1.0
8 < *
9 < * Copyright (c) 1990 - 2002 The Regents of the University of California,
10 < * through Lawrence Berkeley National Laboratory.   All rights reserved.
11 < *
12 < * Redistribution and use in source and binary forms, with or without
13 < * modification, are permitted provided that the following conditions
14 < * are met:
15 < *
16 < * 1. Redistributions of source code must retain the above copyright
17 < *         notice, this list of conditions and the following disclaimer.
18 < *
19 < * 2. Redistributions in binary form must reproduce the above copyright
20 < *       notice, this list of conditions and the following disclaimer in
21 < *       the documentation and/or other materials provided with the
22 < *       distribution.
23 < *
24 < * 3. The end-user documentation included with the redistribution,
25 < *           if any, must include the following acknowledgment:
26 < *             "This product includes Radiance software
27 < *                 (http://radsite.lbl.gov/)
28 < *                 developed by the Lawrence Berkeley National Laboratory
29 < *               (http://www.lbl.gov/)."
30 < *       Alternately, this acknowledgment may appear in the software itself,
31 < *       if and wherever such third-party acknowledgments normally appear.
32 < *
33 < * 4. The names "Radiance," "Lawrence Berkeley National Laboratory"
34 < *       and "The Regents of the University of California" must
35 < *       not be used to endorse or promote products derived from this
36 < *       software without prior written permission. For written
37 < *       permission, please contact [email protected].
38 < *
39 < * 5. Products derived from this software may not be called "Radiance",
40 < *       nor may "Radiance" appear in their name, without prior written
41 < *       permission of Lawrence Berkeley National Laboratory.
42 < *
43 < * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
44 < * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
45 < * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
46 < * DISCLAIMED.   IN NO EVENT SHALL Lawrence Berkeley National Laboratory OR
47 < * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
48 < * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
49 < * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
50 < * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
51 < * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
52 < * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
53 < * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
54 < * SUCH DAMAGE.
55 < * ====================================================================
56 < *
57 < * This software consists of voluntary contributions made by many
58 < * individuals on behalf of Lawrence Berkeley National Laboratory.   For more
59 < * information on Lawrence Berkeley National Laboratory, please see
60 < * <http://www.lbl.gov/>.
61 < */
11 > #ifdef  _WIN32
12  
13 < #ifdef  NORANDOM
64 <
65 < #undef  random
66 < #define  random()       1073741820
67 < #undef  srandom
68 < #define  srandom(s)     (s)
69 < #define  frandom()      0.5
70 < #define  urand(i)       0.5
71 < #define  initurand(n)   (n)
72 <
73 < #else
74 <
75 < #ifdef  MSDOS
76 <
13 > #if (RAND_MAX <= 65536)
14   #define random()        ((long)rand()<<16^(long)rand()<<6^(long)rand()>>4)
15 + #else
16 + #define random()        rand()
17 + #endif
18   #define srandom(s)      srand((unsigned)(s))
19  
20 < #define frandom()       (rand()*(1./32768.))
20 > #define frandom()       (rand()*(1./RAND_MAX))
21  
22   #else
23   #ifdef  BSD
# Line 98 | Line 38 | extern double  drand48();
38   #endif
39   #endif
40  
101 #ifdef  MC
102
103 #define  urand(i)       frandom()
104 #define  initurand(n)   (n)
105
106 #else
107
41   extern unsigned short   *urperm;
42   extern int      urmask;
43  
44 < #define  urand(i)       ((urperm[(i)&urmask]+frandom())/(urmask+1))
44 > #define  urand(i)       (urmask ? ((urperm[(i)&urmask]+frandom())/(urmask+1)) \
45 >                                : frandom())
46  
47 < #endif
47 > extern int      initurand(int size);
48  
115 #endif
116
117 #ifdef NOPROTO
118
119 extern int      initurand();
120 extern int      ilhash();
121 extern int      urind();
122 extern void     multisamp();
123
124 #else
49                                  /* defined in urand.c */
126 extern int      initurand(int size);
50   extern int      ilhash(int *d, int n);
51                                  /* defined in urind.c */
52   extern int      urind(int s, int i);
53                                  /* defined in multisamp.c */
54   extern void     multisamp(double t[], int n, double r);
55  
56 +
57 + #ifdef __cplusplus
58 + }
59   #endif
60 + #endif /* _RAD_RANDOM_H_ */
61 +

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines