Once again, take srand()/random() out of the initialization chain.

They have exactly the wrong kind of randomness for this job - not
returning consistent sequences across different platforms or C library
versions, and because pseodorandom not really better than sampling
the clock.

diff --git a/main.c b/main.c
index 6cfc411fdd79651cc1aa3d49b0d8de4163f89fc7..ba7df1aee1c7bc01283c09ad21f2cc0d00f0b044 100644 (file)
--- a/main.c
+++ b/main.c
@@ -99,7 +99,7 @@ int main(int argc, char *argv[]) {
        lcgstate.a = 1093;
        lcgstate.c = 221587;
        lcgstate.m = 1048576;
-       set_seed_from_time();
+       set_seed((long)time(NULL));
 
 /*  Read the database if we have not yet done so */
 

diff --git a/misc.c b/misc.c
index 7057bad5272b10ec44239d7ff848008e0564d3c8..b6ca80e3094dd7373802b7014c6314e32e4819fc 100644 (file)
--- a/misc.c
+++ b/misc.c
@@ -724,7 +724,8 @@ L2: ATDWRF=I;
 
 
 
-/*  Utility routines (SETBIT, TSTBIT, set_seed_from_time, get_next_lcg_value, randrange, RNDVOC, BUG) */
+/*  Utility routines (SETBIT, TSTBIT, set_seed, get_next_lcg_value,
+ *  randrange, RNDVOC, BUG) */
 
 #undef SETBIT
 long fSETBIT(long BIT) {
@@ -759,11 +760,9 @@ long TSTBIT;
 
 #define TSTBIT(MASK,BIT) fTSTBIT(MASK,BIT)
 
-void set_seed_from_time(void)
+void set_seed(long seedval)
 {
-  /* Use the current system time to get seed the ISO rand() function, from which we get a seed for the LCG. */
-  srand(time(NULL));
-  lcgstate.x = (unsigned long) rand() % lcgstate.m;
+  lcgstate.x = (unsigned long) seedval % lcgstate.m;
 }
 
 unsigned long get_next_lcg_value(void)

diff --git a/misc.h b/misc.h
index 095efba590ac739a385f681b2f6cc79db7f70123..f4567e3b6cfc5eb820450e56c38fef13f228eda8 100644 (file)
--- a/misc.h
+++ b/misc.h
@@ -73,6 +73,6 @@ extern long fIABS(long);
 #define IABS(N) fIABS(N)
 extern long fMOD(long,long);
 #define MOD(N,M) fMOD(N,M)
-extern void set_seed_from_time(void);
+extern void set_seed(long);
 extern unsigned long get_next_lcg_value(void);
 extern long randrange(long);