Skip to content
Snippets Groups Projects
Commit f5df8745 authored by Raymond Toy's avatar Raymond Toy
Browse files

Update tests to match xoroshiro implementation.

parent b8d326cc
No related branches found
No related tags found
No related merge requests found
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
(in-package "RNG-TESTS") (in-package "RNG-TESTS")
(defun 64-bit-rng-state (rng) (defun 64-bit-rng-state (rng)
(let ((state (kernel::xoro-random-state-state rng))) (let ((state (kernel::random-state-state rng)))
(flet ((convert (x) (flet ((convert (x)
(multiple-value-bind (hi lo) (multiple-value-bind (hi lo)
(kernel:double-float-bits x) (kernel:double-float-bits x)
...@@ -15,29 +15,29 @@ ...@@ -15,29 +15,29 @@
(values (convert (aref state 0)) (convert (aref state 1)))))) (values (convert (aref state 0)) (convert (aref state 1))))))
(defun 64-bit-value (rng) (defun 64-bit-value (rng)
(logior (ash (kernel::xoroshiro-chunk rng) 32) (logior (ash (kernel::random-chunk rng) 32)
(kernel::xoroshiro-chunk rng))) (kernel::random-chunk rng)))
(defvar *test-state*) (defvar *test-state*)
(define-test rng.initial-state (define-test rng.initial-state
(setf *test-state* (setf *test-state*
(kernel::make-xoroshiro-object :state (kernel::init-xoro-state #x12345678) (kernel::make-random-object :state (kernel::init-random-state #x12345678)
:rand 0 :rand 0
:cached-p nil)) :cached-p nil))
(multiple-value-bind (s0 s1) (multiple-value-bind (s0 s1)
(64-bit-rng-state *test-state*) (64-bit-rng-state *test-state*)
(assert-equal #x38f1dc39d1906b6f s0) (assert-equal #x38f1dc39d1906b6f s0)
(assert-equal #xdfe4142236dd9517 s1) (assert-equal #xdfe4142236dd9517 s1)
(assert-equal 0 (kernel::xoro-random-state-rand *test-state*)) (assert-equal 0 (kernel::random-state-rand *test-state*))
(assert-equal nil (kernel::xoro-random-state-cached-p *test-state*)))) (assert-equal nil (kernel::random-state-cached-p *test-state*))))
(define-test rng.values-test (define-test rng.values-test
(assert-equal (list #x38f1dc39d1906b6f #xdfe4142236dd9517) (assert-equal (list #x38f1dc39d1906b6f #xdfe4142236dd9517)
(multiple-value-list (64-bit-rng-state *test-state*))) (multiple-value-list (64-bit-rng-state *test-state*)))
(assert-equal 0 (kernel::xoro-random-state-rand *test-state*)) (assert-equal 0 (kernel::random-state-rand *test-state*))
(assert-equal nil (kernel::xoro-random-state-cached-p *test-state*)) (assert-equal nil (kernel::random-state-cached-p *test-state*))
(dolist (item '((#x18d5f05c086e0086 (#x228f4926843b364d #x74dfe78e715c81be)) (dolist (item '((#x18d5f05c086e0086 (#x228f4926843b364d #x74dfe78e715c81be))
(#x976f30b4f597b80b (#x5b6bd4558bd96a68 #x567b7f35650aea8f)) (#x976f30b4f597b80b (#x5b6bd4558bd96a68 #x567b7f35650aea8f))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment