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 394 by tim, Wed Mar 2 16:29:47 2005 UTC vs.
branches/development/src/math/RandNumGen.hpp (file contents), Revision 1665 by gezelter, Tue Nov 22 20:38:56 2011 UTC

# Line 1 | Line 1
1 < /*
1 > /*
2   * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved.
3   *
4   * The University of Notre Dame grants you ("Licensee") a
# 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]  Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
40 + * [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
41   */
42  
43   #ifndef MATH_RANDNUMGEN_HPP
44   #define MATH_RANDNUMGEN_HPP
45  
46   #include <vector>
47 + #include "config.h"
48   #include "MersenneTwister.hpp"
49   #include "utils/simError.h"
50  
51  
52 < namespace oopse {
52 > namespace OpenMD {
53  
54 <
55 <
56 < /**
57 < * @class RandNumGen a random number generator class
58 < */
59 < class RandNumGen{
58 <    public:
59 <        typedef unsigned long uint32;
54 >  /**
55 >   * @class RandNumGen a random number generator class
56 >   */
57 >  class RandNumGen{
58 >  public:
59 >    typedef unsigned long uint32;
60          
61 <        virtual ~RandNumGen() {
62 <            delete mtRand_;
63 <        }
61 >    virtual ~RandNumGen() {
62 >      delete mtRand_;
63 >    }
64          
65 <        /** Returns a real number in [0,1] */
66 <        double rand() {
67 <            return mtRand_->rand();
68 <        }
65 >    /** Returns a real number in [0,1] */
66 >    RealType rand() {
67 >      return mtRand_->rand();
68 >    }
69  
70 <        /** Returns a real number in [0, n] */
71 <        double rand( const double& n ) {
72 <            return mtRand_->rand(n);
73 <        }
70 >    /** Returns a real number in [0, n] */
71 >    RealType rand( const RealType& n ) {
72 >      return mtRand_->rand(n);
73 >    }
74  
75 <        /** Returns a real number in [0, 1) */
76 <        double randExc() {
77 <            return mtRand_->randExc();
78 <        }
75 >    /** Returns a real number in [0, 1) */
76 >    RealType randExc() {
77 >      return mtRand_->randExc();
78 >    }
79  
80 <        /** Returns a real number in [0, n) */        
81 <        double randExc( const double& n ) {
82 <            return mtRand_->randExc(n);
83 <        }
80 >    /** Returns a real number in [0, n) */        
81 >    RealType randExc( const RealType& n ) {
82 >      return mtRand_->randExc(n);
83 >    }
84  
85 <        /** Returns a real number in (0, 1) */                
86 <        double randDblExc() {
87 <            return mtRand_->randDblExc();
88 <        }
85 >    /** Returns a real number in (0, 1) */                
86 >    RealType randDblExc() {
87 >      return mtRand_->randDblExc();
88 >    }
89  
90 <        /** Returns a real number in (0, n) */                        
91 <        double randDblExc( const double& n ) {
92 <            return mtRand_->randDblExc(n);
93 <        }
90 >    /** Returns a real number in (0, n) */                        
91 >    RealType randDblExc( const RealType& n ) {
92 >      return mtRand_->randDblExc(n);
93 >    }
94  
95 <        /** Returns aninteger in [0,2^32-1]  */            
96 <        uint32 randInt() {
97 <           return mtRand_->randInt();
98 <        }
95 >    /** Returns aninteger in [0,2^32-1]  */            
96 >    uint32 randInt() {
97 >      return mtRand_->randInt();
98 >    }
99  
100 <        /** Returns aninteger in [0, n]  for n < 2^32 */    
101 <        uint32 randInt( const uint32& n ) {
102 <           return mtRand_->randInt(n);
103 <        }
100 >    /** Returns aninteger in [0, n]  for n < 2^32 */    
101 >    uint32 randInt( const uint32& n ) {
102 >      return mtRand_->randInt(n);
103 >    }
104          
105 <        /** Returns a 53-bitreal number in [0,1) (capacity of IEEE double precision) */
106 <        double rand53() {
107 <            return mtRand_->rand53();
108 <        }
105 >    /** Returns a 53-bitreal number in [0,1) (capacity of IEEE RealType precision) */
106 >    RealType rand53() {
107 >      return mtRand_->rand53();
108 >    }
109          
110 <        /** Access to nonuniform random number distributions */
111 <        double randNorm( const double& mean, const double& variance) {
112 <            return mtRand_->randNorm(mean, variance);
113 <        }
110 >    /** Access to nonuniform random number distributions */
111 >    RealType randNorm( const RealType mean, const RealType variance) {
112 >      return mtRand_->randNorm(mean, variance);
113 >    }
114          
115 <        // Re-seeding functions with same behavior as initializers
116 <        virtual void seed( const uint32 oneSeed ) = 0;
115 >    // Re-seeding functions with same behavior as initializers
116 >    virtual void seed( const uint32 oneSeed ) = 0;
117          
118 <        virtual void seed()= 0;
118 >    virtual void seed()= 0;
119  
120 <    protected:
121 <        
122 <        MTRand* mtRand_;
120 >  protected:
121 >    MTRand* mtRand_;
122  
123  
124 < };
124 >  };
125  
126   }
127  

Comparing:
trunk/src/math/RandNumGen.hpp (property svn:keywords), Revision 394 by tim, Wed Mar 2 16:29:47 2005 UTC vs.
branches/development/src/math/RandNumGen.hpp (property svn:keywords), Revision 1665 by gezelter, Tue Nov 22 20:38:56 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines