libguile/Makefile.am (snarfcppopts): Remove CFLAGS

[bpt/guile.git] / libguile / random.h

diff --git a/libguile/random.h b/libguile/random.h
index 6cf404f..109969e 100644 (file)
--- a/libguile/random.h
+++ b/libguile/random.h
@@ -3,7 +3,7 @@
 #ifndef SCM_RANDOM_H
 #define SCM_RANDOM_H
 
-/* Copyright (C) 1999,2000,2001, 2006, 2008 Free Software Foundation, Inc.
+/* Copyright (C) 1999,2000,2001, 2006, 2008, 2010 Free Software Foundation, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public License
@@ -39,45 +39,35 @@
  */
 
 typedef struct scm_t_rstate {
-  int reserved0;
-  double reserved1;
+  struct scm_t_rng *rng;
+  double normal_next; /* For scm_c_normal01 */
   /* Custom fields follow here */
 } scm_t_rstate;
 
 typedef struct scm_t_rng {
   size_t rstate_size;                              /* size of random state */
-  unsigned long (*random_bits) (scm_t_rstate *state); /* gives 32 random bits */
+  scm_t_uint32 (*random_bits) (scm_t_rstate *state); /* gives 32 random bits */
   void (*init_rstate) (scm_t_rstate *state, const char *seed, int n);
   scm_t_rstate *(*copy_rstate) (scm_t_rstate *state);
+  void (*from_datum) (scm_t_rstate *state, SCM datum);
+  SCM (*to_datum) (scm_t_rstate *state);
 } scm_t_rng;
 
 SCM_API scm_t_rng scm_the_rng;
 
 \f
-/*
- * Default RNG
- */
-typedef struct scm_t_i_rstate {
-  scm_t_rstate rstate;
-  unsigned long w;
-  unsigned long c;
-} scm_t_i_rstate;
-
-SCM_INTERNAL unsigned long scm_i_uniform32 (scm_t_i_rstate *);
-SCM_INTERNAL void scm_i_init_rstate (scm_t_i_rstate *, const char *seed, int n);
-SCM_INTERNAL scm_t_i_rstate *scm_i_copy_rstate (scm_t_i_rstate *);
-
-\f
 /*
  * Random number library functions
  */
 SCM_API scm_t_rstate *scm_c_make_rstate (const char *, int);
+SCM_API scm_t_rstate *scm_c_rstate_from_datum (SCM datum);
 SCM_API scm_t_rstate *scm_c_default_rstate (void);
-#define scm_c_uniform32(RSTATE) scm_the_rng.random_bits (RSTATE)
+#define scm_c_uniform32(RSTATE) ((RSTATE)->rng->random_bits (RSTATE))
 SCM_API double scm_c_uniform01 (scm_t_rstate *);
 SCM_API double scm_c_normal01 (scm_t_rstate *);
 SCM_API double scm_c_exp1 (scm_t_rstate *);
-SCM_API unsigned long scm_c_random (scm_t_rstate *, unsigned long m);
+SCM_API scm_t_uint32 scm_c_random (scm_t_rstate *, scm_t_uint32 m);
+SCM_API scm_t_uint64 scm_c_random64 (scm_t_rstate *state, scm_t_uint64 m);
 SCM_API SCM scm_c_random_bignum (scm_t_rstate *, SCM m);
 
 \f
@@ -94,6 +84,9 @@ SCM_API SCM scm_var_random_state;
 SCM_API SCM scm_random (SCM n, SCM state);
 SCM_API SCM scm_copy_random_state (SCM state);
 SCM_API SCM scm_seed_to_random_state (SCM seed);
+SCM_API SCM scm_datum_to_random_state (SCM datum);
+SCM_API SCM scm_random_state_to_datum (SCM state);
+SCM_API SCM scm_random_state_from_platform (void);
 SCM_API SCM scm_random_uniform (SCM state);
 SCM_API SCM scm_random_solid_sphere_x (SCM v, SCM state);
 SCM_API SCM scm_random_hollow_sphere_x (SCM v, SCM state);
@@ -102,6 +95,8 @@ SCM_API SCM scm_random_normal_vector_x (SCM v, SCM state);
 SCM_API SCM scm_random_exp (SCM state);
 SCM_INTERNAL void scm_init_random (void);
 
+SCM_INTERNAL void scm_i_random_bytes_from_platform (unsigned char *buf, size_t len);
+
 #endif  /* SCM_RANDOM_H */
 
 /*