ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/src/math/RandNumGen.hpp
(Generate patch)

Comparing:
trunk/src/math/RandNumGen.hpp (file contents), Revision 507 by gezelter, Fri Apr 15 22:04:00 2005 UTC vs.
branches/development/src/math/RandNumGen.hpp (file contents), Revision 1465 by chuckv, Fri Jul 9 23:08:25 2010 UTC

# Line 6 | Line 6
6   * redistribute this software in source and binary code form, provided
7   * that the following conditions are met:
8   *
9 < * 1. Acknowledgement of the program authors must be made in any
10 < *    publication of scientific results based in part on use of the
11 < *    program.  An acceptable form of acknowledgement is citation of
12 < *    the article in which the program was described (Matthew
13 < *    A. Meineke, Charles F. Vardeman II, Teng Lin, Christopher
14 < *    J. Fennell and J. Daniel Gezelter, "OOPSE: An Object-Oriented
15 < *    Parallel Simulation Engine for Molecular Dynamics,"
16 < *    J. Comput. Chem. 26, pp. 252-271 (2005))
17 < *
18 < * 2. Redistributions of source code must retain the above copyright
9 > * 1. Redistributions of source code must retain the above copyright
10   *    notice, this list of conditions and the following disclaimer.
11   *
12 < * 3. Redistributions in binary form must reproduce the above copyright
12 > * 2. Redistributions in binary form must reproduce the above copyright
13   *    notice, this list of conditions and the following disclaimer in the
14   *    documentation and/or other materials provided with the
15   *    distribution.
# Line 37 | Line 28
28   * arising out of the use of or inability to use software, even if the
29   * University of Notre Dame has been advised of the possibility of
30   * such damages.
31 + *
32 + * SUPPORT OPEN SCIENCE!  If you use OpenMD or its source code in your
33 + * research, please cite the appropriate papers when you publish your
34 + * work.  Good starting points are:
35 + *                                                                      
36 + * [1]  Meineke, et al., J. Comp. Chem. 26, 252-271 (2005).            
37 + * [2]  Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006).          
38 + * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008).          
39 + * [4]  Vardeman & Gezelter, in progress (2009).                        
40   */
41  
42   #ifndef MATH_RANDNUMGEN_HPP
43   #define MATH_RANDNUMGEN_HPP
44  
45   #include <vector>
46 + #include "config.h"
47   #include "MersenneTwister.hpp"
48   #include "utils/simError.h"
49  
50  
51 < namespace oopse {
51 > namespace OpenMD {
52  
52 –
53 –
53    /**
54     * @class RandNumGen a random number generator class
55     */
# Line 63 | Line 62 | namespace oopse {
62      }
63          
64      /** Returns a real number in [0,1] */
65 <    double rand() {
65 >    RealType rand() {
66        return mtRand_->rand();
67      }
68  
69      /** Returns a real number in [0, n] */
70 <    double rand( const double& n ) {
70 >    RealType rand( const RealType& n ) {
71        return mtRand_->rand(n);
72      }
73  
74      /** Returns a real number in [0, 1) */
75 <    double randExc() {
75 >    RealType randExc() {
76        return mtRand_->randExc();
77      }
78  
79      /** Returns a real number in [0, n) */        
80 <    double randExc( const double& n ) {
80 >    RealType randExc( const RealType& n ) {
81        return mtRand_->randExc(n);
82      }
83  
84      /** Returns a real number in (0, 1) */                
85 <    double randDblExc() {
85 >    RealType randDblExc() {
86        return mtRand_->randDblExc();
87      }
88  
89      /** Returns a real number in (0, n) */                        
90 <    double randDblExc( const double& n ) {
90 >    RealType randDblExc( const RealType& n ) {
91        return mtRand_->randDblExc(n);
92      }
93  
# Line 102 | Line 101 | namespace oopse {
101        return mtRand_->randInt(n);
102      }
103          
104 <    /** Returns a 53-bitreal number in [0,1) (capacity of IEEE double precision) */
105 <    double rand53() {
104 >    /** Returns a 53-bitreal number in [0,1) (capacity of IEEE RealType precision) */
105 >    RealType rand53() {
106        return mtRand_->rand53();
107      }
108          
109      /** Access to nonuniform random number distributions */
110 <    double randNorm( const double& mean, const double& variance) {
110 >    RealType randNorm( const RealType mean, const RealType variance) {
111        return mtRand_->randNorm(mean, variance);
112      }
113          
# Line 118 | Line 117 | namespace oopse {
117      virtual void seed()= 0;
118  
119    protected:
121 –        
120      MTRand* mtRand_;
121  
122  

Comparing:
trunk/src/math/RandNumGen.hpp (property svn:keywords), Revision 507 by gezelter, Fri Apr 15 22:04:00 2005 UTC vs.
branches/development/src/math/RandNumGen.hpp (property svn:keywords), Revision 1465 by chuckv, Fri Jul 9 23:08:25 2010 UTC

# Line 0 | Line 1
1 + Author Id Revision Date

Diff Legend

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