nojhan/eodev
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Added the eo::rng (instead of rng) as default parameter to all calls.

Browse source 
Also t-eoRandom was abruptly aborting-> a min was greater than a max, and
exceptions were not being caught.
This commit is contained in:
evomarc 2001-02-18 04:34:57 +00:00
commit f36f6d1265
2 changed files with 22 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

10
eo/src/utils/eoRndGenerators.h
View file

@ -68,9 +68,9 @@ template <class T = double> class eoUniformGenerator : public eoRndGenerator<T>
// added new ctor with 2 params, and modified the data to minim and range // added new ctor with 2 params, and modified the data to minim and range
// (was maxim only). MS 3/11/2000 // (was maxim only). MS 3/11/2000
public : public :
eoUniformGenerator(T _max = T(1.0), eoRng& _rng = rng) : eoUniformGenerator(T _max = T(1.0), eoRng& _rng = eo::rng) :
minim(T(0.0)), range(_max), uniform(_rng) {} minim(T(0.0)), range(_max), uniform(_rng) {}
eoUniformGenerator(T _min, T _max, eoRng& _rng = rng) : eoUniformGenerator(T _min, T _max, eoRng& _rng = eo::rng) :
minim(_min), range(_max-_min), uniform(_rng) minim(_min), range(_max-_min), uniform(_rng)
{ {
if (_min>_max) if (_min>_max)
@ -104,7 +104,7 @@ bool eoUniformGenerator<bool>::operator()(void)
class eoBooleanGenerator : public eoRndGenerator<bool> class eoBooleanGenerator : public eoRndGenerator<bool>
{ {
public : public :
eoBooleanGenerator(float _bias = 0.5, eoRng& _rng = rng) : bias(_bias), gen(_rng) {} eoBooleanGenerator(float _bias = 0.5, eoRng& _rng = eo::rng) : bias(_bias), gen(_rng) {}
bool operator()(void) { return gen.flip(bias); } bool operator()(void) { return gen.flip(bias); }
private : private :
@ -120,7 +120,7 @@ class eoBooleanGenerator : public eoRndGenerator<bool>
template <class T = double> class eoNormalGenerator : public eoRndGenerator<T> template <class T = double> class eoNormalGenerator : public eoRndGenerator<T>
{ {
public : public :
eoNormalGenerator(T _stdev = T(1.0), eoRng& _rng = rng) : stdev(_stdev), normal(_rng) {} eoNormalGenerator(T _stdev = T(1.0), eoRng& _rng = eo::rng) : stdev(_stdev), normal(_rng) {}
T operator()(void) { return (T) normal.normal(stdev); } T operator()(void) { return (T) normal.normal(stdev); }
@ -137,7 +137,7 @@ template <class T = double> class eoNormalGenerator : public eoRndGenerator<T>
template <class T = double> class eoNegExpGenerator : public eoRndGenerator<T> template <class T = double> class eoNegExpGenerator : public eoRndGenerator<T>
{ {
public : public :
eoNegExpGenerator(T _mean = 1.0, eoRng& _rng = rng) : mean(_mean), negexp(_rng) {} eoNegExpGenerator(T _mean = 1.0, eoRng& _rng = eo::rng) : mean(_mean), negexp(_rng) {}
T operator()(void) { return (T) negexp.negexp(mean); } T operator()(void) { return (T) negexp.negexp(mean); }

25
eo/test/t-eoRandom.cpp
View file

@ -24,7 +24,7 @@
*/ */
/** /**
CVS Info: $Date: 2001-02-17 10:51:31 $ $Author: maartenkeijzer $ $Revision: 1.8 $ CVS Info: $Date: 2001-02-18 04:34:57 $ $Author: evomarc $ $Revision: 1.9 $
*/ */
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@ -38,17 +38,26 @@ CVS Info: $Date: 2001-02-17 10:51:31 $ $Author: maartenkeijzer $ $Revision: 1.8
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
main() { main() {
try{
eoUniformGenerator<float> u1(-2.5,3.5); eoUniformGenerator<float> u1(-2.5,3.5);
eoUniformGenerator<double> u2(0.003, 0.0005 ); eoUniformGenerator<double> u2(0.0003, 0.0005 );
eoUniformGenerator<unsigned long> u3( 10000000U, 10000U); eoUniformGenerator<unsigned long> u3( 100000U, 10000000U);
/* eoNegExp<float> e1(3.5);
eoNegExp<double> e2(0.003 ); eoNegExpGenerator<float> e1(3.5);
eoNegExp<long> e3( 10000U); eoNegExpGenerator<double> e2(0.003 );
cout << "n1\t\tn2\t\tn3\t\te1\t\te2\t\te3" << endl; */ eoNegExpGenerator<long> e3( 10000U);
/* cout << "n1\t\tn2\t\tn3\t\te1\t\te2\t\te3" << endl; */
for ( unsigned i = 0; i < 100; i ++) { for ( unsigned i = 0; i < 100; i ++) {
cout << u1() << "\t" << u2() << "\t" << u3() << endl; cout << "Uniform: " << u1() << "\t" << u2() << "\t" << u3() << endl;
cout << "NegExp: " << e1() << "\t" << e2() << "\t" << e3() << endl;
} }
}
catch (exception& e)
{
cout << "exception: " << e.what() << endl;;
exit(EXIT_FAILURE);
}
return 0; // to avoid VC++ complaints return 0; // to avoid VC++ complaints
} }