Changeset 39390 in project

Timestamp:

11/26/20 00:30:25 (5 months ago)

Author:

Kon Lovett

Message:

fix fpprecision-epsilon, add tests

Location:

release/5/fp-utils/trunk

Files:

• fp-inlines.scm (modified) (1 diff)
• fp-utils.egg (modified) (1 diff)
• tests/fp-utils-test.scm (modified) (6 diffs)

release/5/fp-utils/trunk/fp-inlines.scm

@@ -119 +119 @@
 (define (fpprecision-factor p #!optional (base 10.0)) (fpexpt base (exact->inexact p)))
 
-(define (fpprecision-epsilon p #!optional (base 10.0))
-  (fp/ 1.0 (fpprecision-factor (fpadd1 (exact->inexact p)) base)) )
+(define (fpprecision-epsilon p #!optional (base 10.0)) (fp/ 1.0 (fpprecision-factor p base)))
 
 ;;

release/5/fp-utils/trunk/fp-utils.egg

@@ -3 +3 @@
 
 ((synopsis "fp utilities")
- (version "4.0.3")
+ (version "4.0.4")
  (category math)
  (author "[[kon lovett]]")

release/5/fp-utils/trunk/tests/fp-utils-test.scm

@@ -4 +4 @@
 (import test)
 
-(test-begin "Fp Utils")
+(test-begin "FP Utils")
 
 ;;;
@@ -15 +15 @@
 (import  (chicken flonum))
 
-(test-group "Fp Inlines"
+(test-group "FP Inlines"
 
   (test-assert (fpzero? 0.0))
@@ -50 +50 @@
 ;;
 
-(define-constant 5eps (fp/ 9.0 1e06))
+(test-group "FP precision"
+  (test 10.0 (fpprecision-factor 1))
+  (test 10000000000.0 (fpprecision-factor 10))
+  (test 15.8489319246111 (fpprecision-factor 1.2))
+  (test 0.1 (fpprecision-epsilon 1))
+  (test 0.0000000001 (fpprecision-epsilon 10))
+  (test 0.0630957344480193 (fpprecision-epsilon 1.2))
+)
 
-(test-group "Fp Approximate ="
+;;
+
+(test-group "FP Approximate ="
 
   ;sweet, sweet repeating expansion
@@ -60 +69 @@
 
   ;own epsilon
-        (test-assert (fp~= 0.123456 0.123457 5eps))
-        (test-assert (fp~<= 0.123456 0.123457 5eps))
-        (test-assert (fp~>= 0.123456 0.123457 5eps))
-        (test-assert (fp~<= 0.123456 0.12346 5eps))
-        (test-assert (fp~>= 0.123456 0.12344 5eps))
+        (let ((eps5 (fpprecision-epsilon 5)))
+    (test-assert (fp~= 0.123456 0.123457 eps5))
+    (test-assert (fp~<= 0.123456 0.123457 eps5))
+    (test-assert (fp~>= 0.123456 0.123457 eps5))
+    (test-assert (fp~<= 0.123456 0.12346 eps5))
+    (test-assert (fp~>= 0.123456 0.12344 eps5)) )
 )
 
@@ -71 +81 @@
 (define-constant 4eps (fp/ 9.0 1e05))
 
-(test-group "Fp Utils"
+(test-group "FP Utils"
 
         (test 1.0 (fpmodulo 5.0 2.0))
@@ -102 +112 @@
 ;;;
 
-(test-end "Fp Utils")
+(test-end "FP Utils")
 
 (test-exit)