Commit b4be0ce6 authored by Lynn Garren's avatar Lynn Garren

updates from Gabriele Cosmo

parent dc2e62f9
2016-11-11 Gabriele Cosmo <Gabriele.Cosmo@cern.ch>
* Random/Random/mixmax.h: corrected value of SPECIALMUL in mixmax.h to correspond to
exact formula for N=17 (m=2^36+1).
* Evaluator/src/Evaluator.cc: fixed array initialisation in Evaluator static method
function().
==============================
26.08.16 Release CLHEP-2.3.3.2
==============================
......
2016-11-11 Gabriele Cosmo <Gabriele.Cosmo@cern.ch>
* Evaluator.cc: fixed array initialisation in Evaluator static method
function().
==============================
26.08.16 Release CLHEP-2.3.3.2
==============================
......
......@@ -142,7 +142,7 @@ static int function(const string & name, stack<double> & par,
if (iter == dictionary.end()) return EVAL::ERROR_UNKNOWN_FUNCTION;
Item item = iter->second;
double pp[MAX_N_PAR];
double pp[MAX_N_PAR] = {0.0};
for(int i=0; i<npar; i++) { pp[i] = par.top(); par.pop(); }
errno = 0;
if (item.function == 0) return EVAL::ERROR_CALCULATION_ERROR;
......
2016-11-11 Gabriele Cosmo <Gabriele.Cosmo@cern.ch>
* mixmax.h: corrected value of SPECIALMUL in mixmax.h to correspond to
exact formula for N=17 (m=2^36+1).
==============================
26.08.16 Release CLHEP-2.3.3.2
==============================
......
......@@ -133,13 +133,13 @@ void branch_inplace( rng_state_t* Xin, myID_t* ID ); // almost the same as apply
// the charpoly is irreducible for the combinations of N and SPECIAL and has maximal period for N=508, 256, half period for 1260, and 1/12 period for 3150
// #if (N==256)
#define SPECIALMUL 0
#define SPECIAL 487013230256099064ULL // s=487013230256099064, m=1 -- good old MIXMAX
#define MOD_MULSPEC(k) fmodmulM61( 0, SPECIAL , (k) );
/*
#elif (N==17)
#define SPECIALMUL 36 // m=2^37+1
// #define SPECIALMUL 0
// #define SPECIAL 487013230256099064ULL // s=487013230256099064, m=1 -- good old MIXMAX
// #define MOD_MULSPEC(k) fmodmulM61( 0, SPECIAL , (k) );
// #elif (N==17)
#define SPECIALMUL 36 // m=2^36+1
/*
#elif (N==8)
#define SPECIALMUL 53 // m=2^53+1
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment