Rename epfn1/2 to epunary/binary

Author: pavpanchekha

ops/core.rkt

@@ -14,8 +14,8 @@
          mk-big-ival
          new-ival
          ival-maybe
-         epfn1
-         epfn2
+         epunary
+         epbinary
          split-ival
          ival-max-prec
          ival-exact-neg
@@ -241,13 +241,12 @@
            (or xerr? yerr?)
            (and xerr yerr))]))
 
-
 ;; These functions compute and propagate the immovable? flag for endpoints
-(define (epfn1 op arg)
+(define (epunary op arg)
   (define-values (result exact?) (bf-return-exact? op (list (endpoint-val arg))))
   (endpoint result (and (endpoint-immovable? arg) exact?)))
 
-(define (epfn2 op arg0 arg1)
+(define (epbinary op arg0 arg1)
   (define-values (result exact?) (bf-return-exact? op (list (endpoint-val arg0) (endpoint-val arg1))))
   (endpoint result (and (endpoint-immovable? arg0) (endpoint-immovable? arg1) exact?)))
 
@@ -294,11 +293,11 @@
 
 (define ((monotonic bffn) x)
   (match-define (ival lo hi err? err) x)
-  (ival (rnd 'down epfn1 bffn lo) (rnd 'up epfn1 bffn hi) err? err))
+  (ival (rnd 'down epunary bffn lo) (rnd 'up epunary bffn hi) err? err))
 
 (define ((comonotonic bffn) x)
   (match-define (ival lo hi err? err) x)
-  (ival (rnd 'down epfn1 bffn hi) (rnd 'up epfn1 bffn lo) err? err))
+  (ival (rnd 'down epunary bffn hi) (rnd 'up epunary bffn lo) err? err))
 
 (define ((close-enough->ival bffn) x)
   (match-define (ival (endpoint lo lo!) (endpoint hi hi!) err? err) x)
@@ -390,7 +389,6 @@
      (define abs-hi (epunary! tmp2 mpfr-abs! (ival-hi x) 'up))
      (ival (endpoint (bf 0) (and xlo! xhi!)) (endpoint-max2 abs-lo abs-hi 'up) xerr? xerr)]))
 
-
 ;; These functions execute ival-fabs and ival-neg with input's precision
 (define (ival-max-prec x)
   (max (bigfloat-precision (ival-lo-val x)) (bigfloat-precision (ival-hi-val x))))
@@ -665,8 +663,8 @@
   (define err? (or (ival-err? y) xerr?))
   (define err (or (ival-err y) xerr))
   (match* (can-neg can-pos)
-    [(#t #t) (ival (rnd 'down epfn1 bfneg xhi) (rnd 'up epfn1 bfcopy xhi) err? err)]
-    [(#t #f) (ival (rnd 'down epfn1 bfneg xhi) (rnd 'up epfn1 bfneg xlo) err? err)]
+    [(#t #t) (ival (rnd 'down epunary bfneg xhi) (rnd 'up epunary bfcopy xhi) err? err)]
+    [(#t #f) (ival (rnd 'down epunary bfneg xhi) (rnd 'up epunary bfneg xlo) err? err)]
     [(#f #t) (ival xlo xhi err? err)]
     [(#f #f)
      (unless (ival-err y)

ops/gamma.rkt

@@ -44,8 +44,8 @@
     ; Purely decreasing
     [(bflt? (endpoint-val hi) xmin) ((comonotonic->ival fn) i)]
     [else
-     (ival-union (ival (endpoint ymin #f) (rnd 'up epfn1 fn lo) err? err)
-                 (ival (endpoint ymin #f) (rnd 'up epfn1 fn hi) err? err))]))
+     (ival-union (ival (endpoint ymin #f) (rnd 'up epunary fn lo) err? err)
+                 (ival (endpoint ymin #f) (rnd 'up epunary fn hi) err? err))]))
 
 ; Optimized version of `ival-lgamma-basin` for positive values, adds a cache
 (define lgamma-pos-xmin #f)

ops/trig.rkt

@@ -42,10 +42,10 @@
          [1 ((comonotonic->ival (curry bfcosu n)) x)]
          [else
           (ival (rnd 'down
-                     epfn2
+                     epbinary
                      bfmin2
-                     (epfn1 (curry bfcosu n) (ival-lo x))
-                     (epfn1 (curry bfcosu n) (ival-hi x)))
+                     (epunary (curry bfcosu n) (ival-lo x))
+                     (epunary (curry bfcosu n) (ival-hi x)))
                 (endpoint 1.bf #f)
                 (ival-err? x)
                 (ival-err x))])]
@@ -59,18 +59,18 @@
          [(and (bf=? (bfsub b a) 1.bf) (bfeven? a))
           (ival (endpoint -1.bf #f)
                 (rnd 'up
-                     epfn2
+                     epbinary
                      bfmax2
-                     (epfn1 (curry bfcosu n) (ival-lo x))
-                     (epfn1 (curry bfcosu n) (ival-hi x)))
+                     (epunary (curry bfcosu n) (ival-lo x))
+                     (epunary (curry bfcosu n) (ival-hi x)))
                 (ival-err? x)
                 (ival-err x))]
          [(and (bf=? (bfsub b a) 1.bf) (bfodd? a))
           (ival (rnd 'down
-                     epfn2
+                     epbinary
                      bfmin2
-                     (epfn1 (curry bfcosu n) (ival-lo x))
-                     (epfn1 (curry bfcosu n) (ival-hi x)))
+                     (epunary (curry bfcosu n) (ival-lo x))
+                     (epunary (curry bfcosu n) (ival-hi x)))
                 (endpoint 1.bf #f)
                 (ival-err? x)
                 (ival-err x))]
@@ -86,7 +86,7 @@
        [-1 ((monotonic->ival bfcos) x)]
        [1 ((comonotonic->ival bfcos) x)]
        [else
-        (ival (rnd 'down epfn2 bfmin2 (epfn1 bfcos (ival-lo x)) (epfn1 bfcos (ival-hi x)))
+        (ival (rnd 'down epbinary bfmin2 (epunary bfcos (ival-lo x)) (epunary bfcos (ival-hi x)))
               (endpoint 1.bf #f)
               (ival-err? x)
               (ival-err x))])]
@@ -99,11 +99,11 @@
        [(and (bf=? a b) (bfodd? a)) ((monotonic->ival bfcos) x)]
        [(and (bf=? (bfsub b a) 1.bf) (bfeven? a))
         (ival (endpoint -1.bf #f)
-              (rnd 'up epfn2 bfmax2 (epfn1 bfcos (ival-lo x)) (epfn1 bfcos (ival-hi x)))
+              (rnd 'up epbinary bfmax2 (epunary bfcos (ival-lo x)) (epunary bfcos (ival-hi x)))
               (ival-err? x)
               (ival-err x))]
        [(and (bf=? (bfsub b a) 1.bf) (bfodd? a))
-        (ival (rnd 'down epfn2 bfmin2 (epfn1 bfcos (ival-lo x)) (epfn1 bfcos (ival-hi x)))
+        (ival (rnd 'down epbinary bfmin2 (epunary bfcos (ival-lo x)) (epunary bfcos (ival-hi x)))
               (endpoint 1.bf #f)
               (ival-err? x)
               (ival-err x))]
@@ -126,18 +126,18 @@
          [(and (bf=? (bfsub b a) 1.bf) (bfodd? a))
           (ival (endpoint -1.bf #f)
                 (rnd 'up
-                     epfn2
+                     epbinary
                      bfmax2
-                     (epfn1 (curry bfsinu n) (ival-lo x))
-                     (epfn1 (curry bfsinu n) (ival-hi x)))
+                     (epunary (curry bfsinu n) (ival-lo x))
+                     (epunary (curry bfsinu n) (ival-hi x)))
                 (ival-err? x)
                 (ival-err x))]
          [(and (bf=? (bfsub b a) 1.bf) (bfeven? a))
           (ival (rnd 'down
-                     epfn2
+                     epbinary
                      bfmin2
-                     (epfn1 (curry bfsinu n) (ival-lo x))
-                     (epfn1 (curry bfsinu n) (ival-hi x)))
+                     (epunary (curry bfsinu n) (ival-lo x))
+                     (epunary (curry bfsinu n) (ival-hi x)))
                 (endpoint 1.bf #f)
                 (ival-err? x)
                 (ival-err x))]
@@ -159,11 +159,11 @@
        [(and (bf=? a b) (bfeven? a)) ((monotonic->ival bfsin) x)]
        [(and (bf=? (bfsub b a) 1.bf) (bfodd? a))
         (ival (endpoint -1.bf #f)
-              (rnd 'up epfn2 bfmax2 (epfn1 bfsin (ival-lo x)) (epfn1 bfsin (ival-hi x)))
+              (rnd 'up epbinary bfmax2 (epunary bfsin (ival-lo x)) (epunary bfsin (ival-hi x)))
               (ival-err? x)
               (ival-err x))]
        [(and (bf=? (bfsub b a) 1.bf) (bfeven? a))
-        (ival (rnd 'down epfn2 bfmin2 (epfn1 bfsin (ival-lo x)) (epfn1 bfsin (ival-hi x)))
+        (ival (rnd 'down epbinary bfmin2 (epunary bfsin (ival-lo x)) (epunary bfsin (ival-hi x)))
               (endpoint 1.bf #f)
               (ival-err? x)
               (ival-err x))]

test.rkt

@@ -3,19 +3,7 @@
 (require racket/math
          math/base
          math/flonum
-         (only-in math/bigfloat
-                  bf>
-                  bf<
-                  bf=
-                  bf>=
-                  bf<=
-                  bf-
-                  bf+
-                  bf*
-                  bf/
-                  bfmin
-                  bfmax
-                  bfshift))
+         (only-in math/bigfloat bf> bf< bf= bf>= bf<= bf- bf+ bf* bf/ bfmin bfmax bfshift))
 (require rackunit)
 (require "main.rkt"
          "mpfr.rkt")