Shufflerator now shuffles like the NL one does!

[clnl] / src / main / random.lisp

diff --git a/src/main/random.lisp b/src/main/random.lisp
index 7fca5a183d4360398f9ac129b2275067b5891da7..6c9ecaa7c6fd42b6d4cba8653d665b74a42c29a2 100644 (file)
--- a/src/main/random.lisp
+++ b/src/main/random.lisp
@@ -1,7 +1,3 @@
-(defpackage #:cl-nl.random
- (:use :common-lisp)
- (:export :set-seed :next-int :next-double))
-
 (in-package #:cl-nl.random)
 
 ; This is a wrapper around the very nice mersenne twister mt19937 to match
@@ -11,7 +7,10 @@
  (setf mt19937:*random-state* (mt19937::make-random-object :state (mt19937:init-random-state n))))
 
 (defun next-int (n)
- (rem (ash (mt19937:random-chunk mt19937:*random-state*) -1) n))
+ (if
+  (= n (logand n (- n) ))
+  (ash (* n (ash (mt19937:random-chunk mt19937:*random-state*) -1) ) -31)
+  (rem (ash (mt19937:random-chunk mt19937:*random-state*) -1) n)))
 
 (defun next-double (&optional (n 1d0))
  (let
@@ -22,3 +21,15 @@
    (+ (ash (ash y -6) 27) (ash z -5))
    (coerce (ash 1 53) 'double-float))
   n)))
+
+; Oh, export world, you WILL be mine
+(defun export ()
+ (let
+  ((state
+    (map
+     'list
+     (lambda (x) (if (logbitp (1- 32) x) (dpb x (byte 32 0) -1) x))
+     (mt19937::random-state-state mt19937:*random-state*))))
+  (format nil "0 ~A ~A ~A 0.0 false ~{~A~^ ~}"
+   (first state) (second state) (third state)
+   (nthcdr 3 state))))