Skip to content
Snippets Groups Projects
Commit 0dea93db authored by pfdietz's avatar pfdietz
Browse files

More numeric comparison tests.

parent c39a509f
No related branches found
No related tags found
No related merge requests found
...@@ -7,5 +7,3 @@ ...@@ -7,5 +7,3 @@
(compile-and-load "numbers-aux.lsp") (compile-and-load "numbers-aux.lsp")
(load "number-comparison.lsp") (load "number-comparison.lsp")
...@@ -5,6 +5,8 @@ ...@@ -5,6 +5,8 @@
(in-package :cl-test) (in-package :cl-test)
(compile-and-load "numbers-aux.lsp")
;;; Errors tests on comparison functions ;;; Errors tests on comparison functions
(deftest =.error.1 (deftest =.error.1
...@@ -87,6 +89,7 @@ ...@@ -87,6 +89,7 @@
collect args) collect args)
nil) nil)
(deftest =.9 (deftest =.9
(=t 0 0.0) (=t 0 0.0)
t) t)
...@@ -102,3 +105,569 @@ ...@@ -102,3 +105,569 @@
(deftest =.12 (deftest =.12
(=t -0.0 0.0) (=t -0.0 0.0)
t) t)
(deftest =.13
(let ((nums '(0 0.0s0 0.0f0 0.0d0 0.0l0
#c(0.0s0 0.0s0) #c(0.0f0 0.0f0)
#c(0.0d0 0.0d0) #c(0.0l0 0.0l0))))
(loop for x in nums
append
(loop for y in nums
unless (= x y)
collect (list x y))))
nil)
(deftest =.14
(let ((nums '(17 17.0s0 17.0f0 17.0d0 17.0l0
#c(17.0s0 0.0s0) #c(17.0f0 0.0f0)
#c(17.0d0 0.0d0) #c(17.0l0 0.0l0))))
(loop for x in nums
append
(loop for y in nums
unless (= x y)
collect (list x y))))
nil)
(deftest =.15
(let ((nums '(-17 -17.0s0 -17.0f0 -17.0d0 -17.0l0
#c(-17.0s0 0.0s0) #c(-17.0f0 0.0f0)
#c(-17.0d0 0.0d0) #c(-17.0l0 0.0l0))))
(loop for x in nums
append
(loop for y in nums
unless (= x y)
collect (list x y))))
nil)
(deftest =.16
(let ((n 60000) (m 30000))
(loop for x = (- (random n) m)
for y = (- (random n) m)
for z = (- (random n) m)
for w = (- (random n) m)
for a = (* x y)
for b = (* x w)
for c = (* y z)
for d = (* w z)
repeat 10000
when (and (/= b 0)
(/= d 0)
(or (not (= (/ a b) (/ c d)))
(/= (/ a b) (/ c d))))
collect (list a b c d)))
nil)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(deftest /=.1
(loop for x in *numbers*
unless (/= x)
collect x)
nil)
(deftest /=.2
(loop for x in *numbers*
when (/= x x)
collect x)
nil)
(deftest /=.3
(loop for x in *numbers*
when (/= x x x)
collect x)
nil)
(deftest /=.4
(/=.4-fn)
nil)
(deftest /=.4a
(/=.4a-fn)
nil)
(deftest /=.5
(loop for i from 1 to 10000
for i2 = (1+ i)
always (and (/= i i2) (/= i2 i)))
t)
(deftest /=.6
(loop for i from 5 to 10000 by 17
for j from 2 to i by 19
for r = (/ i j)
when (or (not (/= r (1+ r)))
(not (/= r 0))
(not (/= r (- r)))
(/= r r))
collect r)
nil)
(deftest /=.7
(let ((args (list 17))
(args2 nil))
(loop for i from 2 to (min 256 call-arguments-limit)
do (push 17 args)
do (push i args2)
always (and (not (apply #'/= args))
(apply #'/= args2))))
t)
(deftest /=.8
(loop for i from 2 to (min 256 call-arguments-limit)
for args = (append (make-list (1- i) :initial-element 7)
(list 7))
when (apply #'/= args)
collect args)
nil)
(deftest /=.9
(/= 0 0.0)
nil)
(deftest /=.10
(/= 0 #c(0 0))
nil)
(deftest /=.11
(/= 1 #c(1.0 0.0))
nil)
(deftest /=.12
(/= -0.0 0.0)
nil)
(deftest /=.13
(let ((nums '(0 0.0s0 0.0f0 0.0d0 0.0l0
#c(0.0s0 0.0s0) #c(0.0f0 0.0f0)
#c(0.0d0 0.0d0) #c(0.0l0 0.0l0))))
(loop for x in nums
append
(loop for y in nums
when (/= x y)
collect (list x y))))
nil)
(deftest /=.14
(let ((nums '(17 17.0s0 17.0f0 17.0d0 17.0l0
#c(17.0s0 0.0s0) #c(17.0f0 0.0f0)
#c(17.0d0 0.0d0) #c(17.0l0 0.0l0))))
(loop for x in nums
append
(loop for y in nums
when (/= x y)
collect (list x y))))
nil)
(deftest /=.15
(let ((nums '(-17 -17.0s0 -17.0f0 -17.0d0 -17.0l0
#c(-17.0s0 0.0s0) #c(-17.0f0 0.0f0)
#c(-17.0d0 0.0d0) #c(-17.0l0 0.0l0))))
(loop for x in nums
append
(loop for y in nums
when (/= x y)
collect (list x y))))
nil)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(deftest <.1
(let ((a 0) (b 1)) (notnot-mv (< a b)))
t)
(deftest <.2
(let ((a 0) (b 0)) (notnot-mv (< a b)))
nil)
(deftest <.3
(let ((a 1) (b 0)) (notnot-mv (< a b)))
nil)
(defparameter *number-less-tests*
(let* ((n (- most-positive-fixnum most-negative-fixnum))
(n2 (* 1000 n)))
(nconc
(loop for i = (+ (random n) most-negative-fixnum)
for i2 = (+ i (random most-positive-fixnum))
repeat 1000
nconc
(list (list i i2 t) (list i2 i nil)))
(loop for i = (random n2)
for i2 = (+ (random n2) i)
repeat 1000
nconc
(list (list i i2 t) (list i2 i nil)))
(loop for x in *universe*
when (integerp x)
nconc (list (list x (1+ x) t)
(list (1+ x) x nil)))
(loop for x in *universe*
when (realp x)
collect (list x x nil))
(loop for x in *universe*
when (and (realp x) (>= x 1))
nconc
(loop for epsilon in (list short-float-epsilon
single-float-epsilon
double-float-epsilon
long-float-epsilon)
for bound in (list most-positive-short-float
most-positive-single-float
most-positive-double-float
most-positive-long-float)
for one in '(1.0s0 1.0f0 1.0d0 1.0l0)
when (<= x bound)
nconc
(let* ((y (float x one))
(z (* y (- one (* 2 epsilon)))))
(list (list y z nil)
(list z y t)))))
(loop for x in *universe*
when (and (realp x) (<= x -1))
nconc
(loop for epsilon in (list short-float-epsilon
single-float-epsilon
double-float-epsilon
long-float-epsilon)
for bound in (list most-negative-short-float
most-negative-single-float
most-negative-double-float
most-negative-long-float)
for one in '(1.0s0 1.0f0 1.0d0 1.0l0)
when (>= x bound)
nconc
(let* ((y (float x one))
(z (* y (- one (* 2 epsilon)))))
(list (list y z t)
(list z y nil)))))
(loop for x in *universe*
when (and (realp x) (< -1 x 1))
nconc
(loop for epsilon in (list short-float-epsilon
single-float-epsilon
double-float-epsilon
long-float-epsilon)
for one in '(1.0s0 1.0f0 1.0d0 1.0l0)
nconc
(let* ((y (float x one))
(z1 (+ y epsilon))
(z2 (- y epsilon)))
(list (list y z1 t)
(list z1 y nil)
(list y z2 nil)
(list z2 y t)))))
)))
(deftest <.4
(loop for (x y result . rest) in *number-less-tests*
unless (if (< x y) result (not result))
collect (list* x y result rest))
nil)
(deftest <.5
(loop for x in *universe*
when (and (typep x 'real)
(not (< x)))
collect x)
nil)
(deftest <.6
(let ((args (list 17))
(args2 nil))
(loop for i from 2 to (min 256 call-arguments-limit)
do (push 17 args)
do (push (- i) args2)
unless (and (not (apply #'< args))
(apply #'< args2))
collect (list args args2)))
nil)
(deftest <.7
(let* ((len (min 256 call-arguments-limit))
(args-proto (loop for i from 1 to len collect i)))
(loop for i from 1 below len
for args = (copy-list args-proto)
do (setf (elt args i) 0)
never (apply #'< args)))
t)
;;; Check that < is antisymmetric
(deftest <.8
(<.8-fn)
nil)
;;; < is symmetric with >
(deftest <.9
(<.9-fn)
nil)
;;; < is negation of >=
(deftest <.10
(<.10-fn)
nil)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(deftest <=.1
(let ((a 0) (b 1)) (notnot-mv (<= a b)))
t)
(deftest <=.2
(let ((a 0) (b 0)) (notnot-mv (<= a b)))
t)
(deftest <=.3
(let ((a 1) (b 0)) (notnot-mv (<= a b)))
nil)
(defparameter *number-less-or-equal-tests*
(let* ((n (- most-positive-fixnum most-negative-fixnum))
(n2 (* 1000 n)))
(nconc
(loop for i = (+ (random n) most-negative-fixnum)
for i2 = (+ i (random most-positive-fixnum))
repeat 1000
nconc
(list (list i i2 t) (list i2 i nil)))
(loop for i = (random n2)
for i2 = (+ (random n2) i)
repeat 1000
nconc
(list (list i i2 t) (list i2 i nil)))
(loop for x in *universe*
when (integerp x)
nconc (list (list x (1+ x) t)
(list (1+ x) x nil)))
(loop for x in *universe*
when (realp x)
collect (list x x t))
(loop for x in *universe*
when (and (realp x) (>= x 1))
nconc
(loop for epsilon in (list short-float-epsilon
single-float-epsilon
double-float-epsilon
long-float-epsilon)
for bound in (list most-positive-short-float
most-positive-single-float
most-positive-double-float
most-positive-long-float)
for one in '(1.0s0 1.0f0 1.0d0 1.0l0)
when (<= x bound)
nconc
(let* ((y (float x one))
(z (* y (- one (* 2 epsilon)))))
(list (list y z nil)
(list z y t)))))
(loop for x in *universe*
when (and (realp x) (<= x -1))
nconc
(loop for epsilon in (list short-float-epsilon
single-float-epsilon
double-float-epsilon
long-float-epsilon)
for bound in (list most-negative-short-float
most-negative-single-float
most-negative-double-float
most-negative-long-float)
for one in '(1.0s0 1.0f0 1.0d0 1.0l0)
when (>= x bound)
nconc
(let* ((y (float x one))
(z (* y (- one (* 2 epsilon)))))
(list (list y z t)
(list z y nil)))))
(loop for x in *universe*
when (and (realp x) (< -1 x 1))
nconc
(loop for epsilon in (list short-float-epsilon
single-float-epsilon
double-float-epsilon
long-float-epsilon)
for one in '(1.0s0 1.0f0 1.0d0 1.0l0)
nconc
(let* ((y (float x one))
(z1 (+ y epsilon))
(z2 (- y epsilon)))
(list (list y z1 t)
(list z1 y nil)
(list y z2 nil)
(list z2 y t)))))
)))
(deftest <=.4
(loop for (x y result . rest) in *number-less-or-equal-tests*
unless (if (<= x y) result (not result))
collect (list* x y result rest))
nil)
(deftest <=.5
(loop for x in *universe*
when (and (typep x 'real)
(not (<= x)))
collect x)
nil)
(deftest <=.6
(let ((args (list 17))
(args2 nil)
(args3 (list 0)))
(loop for i from 2 to (min 256 call-arguments-limit)
do (push 17 args)
do (push (- i) args2)
do (push i args3)
unless (and (apply #'<= args)
(apply #'<= args2)
(not (apply #'<= args3)))
collect (list args args2 args3)))
nil)
(deftest <=.7
(let* ((len (min 256 call-arguments-limit))
(args-proto (loop for i from 1 to len collect i)))
(loop for i from 1 below len
for args = (copy-list args-proto)
do (setf (elt args i) 0)
never (apply #'<= args)))
t)
;;; Check that <= is symmetric with >=
(deftest <=.8
(<=.8-fn)
nil)
;;; Check that <= is equivalent to (or < =)
(deftest <=.9
(<=.9-fn)
nil)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(deftest >.1
(let ((a 0) (b 1)) (notnot-mv (> a b)))
nil)
(deftest >.2
(let ((a 0) (b 0)) (notnot-mv (> a b)))
nil)
(deftest >.3
(let ((a 1) (b 0)) (notnot-mv (> a b)))
t)
(deftest >.4
(loop for (x y result . rest) in *number-less-tests*
unless (if (> y x) result (not result))
collect (list* y x result rest))
nil)
(deftest >.5
(loop for x in *universe*
when (and (typep x 'real)
(not (> x)))
collect x)
nil)
(deftest >.6
(let ((args (list 17))
(args2 nil))
(loop for i from 2 to (min 256 call-arguments-limit)
do (push 17 args)
do (push i args2)
unless (and (not (apply #'> args))
(apply #'> args2))
collect (list args args2)))
nil)
(deftest >.7
(let* ((len (min 256 call-arguments-limit))
(args-proto (loop for i from 1 to len collect i)))
(loop for i from 1 below len
for args = (copy-list args-proto)
do (setf (elt args i) 0)
never (apply #'> args)))
t)
;;; > is negation of <=
(deftest >.8
(>.8-fn)
nil)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(deftest >=.1
(let ((a 0) (b 1)) (notnot-mv (>= a b)))
nil)
(deftest >=.2
(let ((a 0) (b 0)) (notnot-mv (>= a b)))
t)
(deftest >=.3
(let ((a 1) (b 0)) (notnot-mv (>= a b)))
t)
(deftest >=.4
(loop for (x y result . rest) in *number-less-or-equal-tests*
unless (if (>= y x) result (not result))
collect (list* y x result rest))
nil)
(deftest >=.5
(loop for x in *universe*
when (and (typep x 'real)
(not (>= x)))
collect x)
nil)
(deftest >=.6
(let ((args (list 17))
(args2 (list 0))
(args3 nil))
(loop for i from 2 to (min 256 call-arguments-limit)
do (push 17 args)
do (push (- i) args2)
do (push i args3)
unless (and (apply #'>= args)
(not (apply #'>= args2))
(apply #'>= args3))
collect (list args args2 args3)))
nil)
(deftest >=.7
(let* ((len (min 256 call-arguments-limit))
(args-proto (loop for i from 1 to len collect i)))
(loop for i from 1 below len
for args = (copy-list args-proto)
do (setf (elt args i) 0)
never (apply #'>= args)))
t)
;;; Check that >= is equivalent to (or > =)
(deftest >=.8
(>=.8-fn)
nil)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;; Comparison of rationals
(deftest compare-rationals.1
(compare-random-rationals 60000 30000 10000)
nil)
(deftest compare-rationals.2
(compare-random-rationals 600000 300000 10000)
nil)
(deftest compare-rationals.3
(compare-random-rationals 6000000 3000000 10000)
nil)
(deftest compare-rationals.4
(compare-random-rationals 6000000000 3000000000 10000)
nil)
...@@ -11,3 +11,115 @@ ...@@ -11,3 +11,115 @@
(loop for y in *numbers* (loop for y in *numbers*
unless (if (= x y) (= y x) (not (= y x))) unless (if (= x y) (= y x) (not (= y x)))
collect (list x y)))) collect (list x y))))
(defun /=.4-fn ()
(loop for x in *numbers*
append
(loop for y in *numbers*
unless (if (/= x y) (/= y x) (not (/= y x)))
collect (list x y))))
(defun /=.4a-fn ()
(loop for x in *numbers*
append
(loop for y in *numbers*
when (if (= x y)
(/= x y)
(not (/= x y)))
collect (list x y))))
(defun <.8-fn ()
(loop for x in *numbers*
when (realp x)
nconc
(loop for y in *numbers*
when (and (realp y) (and (< x y) (> x y)))
collect (list x y))))
(defun <.9-fn ()
(loop for x in *numbers*
when (realp x)
nconc
(loop for y in *numbers*
when (and (realp y) (if (< x y)
(not (> y x))
(> y x)))
collect (list x y))))
(defun <.10-fn ()
(loop for x in *numbers*
when (realp x)
nconc
(loop for y in *numbers*
when (and (realp y) (if (< x y)
(>= x y)
(not (>= x y))))
collect (list x y))))
(defun <=.8-fn ()
(loop for x in *numbers*
when (realp x)
nconc
(loop for y in *numbers*
when (and (realp y) (if (<= x y) (not (>= y x))
(>= y x)))
collect (list x y))))
(defun <=.9-fn ()
(loop for x in *numbers*
when (realp x)
nconc
(loop for y in *numbers*
when (and (realp y)
(if (<= x y) (not (or (= x y) (< x y)))
(or (= x y) (< x y))))
collect (list x y))))
(defun >.8-fn ()
(loop for x in *numbers*
when (realp x)
nconc
(loop for y in *numbers*
when (and (realp y) (if (> x y)
(<= x y)
(not (<= x y))))
collect (list x y))))
(defun >=.8-fn ()
(loop for x in *numbers*
when (realp x)
nconc
(loop for y in *numbers*
when (and (realp y)
(if (>= x y) (not (or (= x y) (> x y)))
(or (= x y) (> x y))))
collect (list x y))))
;;; Comparison of rationsls
(defun compare-random-rationals (n m rep)
(loop for a = (- (random n) m)
for b = (- (random n) m)
for c = (- (random n) m)
for d = (- (random n) m)
repeat rep
when
(and (/= b 0)
(/= d 0)
(let ((q1 (/ a b))
(q2 (/ c d))
(ad (* a d))
(bc (* b c)))
(when (< (* b d) 0)
(setq ad (- ad))
(setq bc (- bc)))
(or (if (< q1 q2) (not (< ad bc)) (< ad bc))
(if (<= q1 q2) (not (<= ad bc)) (<= ad bc))
(if (> q1 q2) (not (> ad bc)) (> ad bc))
(if (>= q1 q2) (not (>= ad bc)) (>= ad bc))
(if (= q1 q2) (not (= ad bc)) (= ad bc))
(if (/= q1 q2) (not (/= ad bc)) (/= ad bc)))))
collect (list a b c d)))
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