Merge remote-tracking branch 'origin/develop' into enhancement-rfsim

openair1/SIMULATION/TOOLS/rangen_double.c

@@ -63,33 +63,6 @@ void randominit(unsigned seed_init)
 }
 #endif
 
-#if 0
-void randominit(unsigned seed_init)
-{
-  int i;
-  // this need to be integrated with the existing rng, like taus: navid
-  LOG_D(PHY,"Initializing random number generator, seed %x\n",seed_init);
-
-  seed_init = 62110;
-
-  if (seed_init == 0) {
-    srand((unsigned)time(NULL));
-
-    seed = (unsigned int) rand();
-  } else {
-    seed = seed_init;
-  }
-
-  if (seed % 2 == 0) seed += 1; /* seed and mod are relative prime */
-
-  for (i=1; i<=97; i++) {
-    seed = a*seed;                 /* mod 2**32  */
-    ir[i]= seed;                   /* initialize the shuffle table    */
-  }
-
-  iy=1;
-}
-#endif
 /*!\brief Uniform linear congruential random number generator on \f$[0,1)\f$.  Returns a double-precision floating-point number.*/
 
 double uniformrandom(void)

openair1/SIMULATION/TOOLS/taus.c

@@ -65,35 +65,6 @@ void set_taus_seed(unsigned int seed_init)
 }
 #endif
 
-#if 0
- void set_taus_seed(unsigned int seed_init)
-{
-
-  struct drand48_data buffer;
-  unsigned long result = 0;
-    s0 = (unsigned int)0x1e23d852;
-    s1 = (unsigned int)0x81f38a1c;
-    s2 = (unsigned int)0xfe1a133e;
-
-    return;
-
-  if (seed_init == 0) {
-    s0 = (unsigned int)time(NULL);
-    s1 = (unsigned int)time(NULL);
-    s2 = (unsigned int)time(NULL);
-  } else {
-   // Use reentrant version of rand48 to ensure that no conflicts with other generators occur */
-    srand48_r((long int)seed_init, &buffer);
-    mrand48_r(&buffer, (long int *)&result);
-    s0 = result;
-    mrand48_r(&buffer, (long int *)&result);
-    s1 = result;
-    mrand48_r(&buffer, (long int *)&result);
-    s2 = result;
-  }
-}
-#endif
-
 #ifdef MAIN
 
 main()