Merge pull request #124 from herbie-fp/codex/split-epfn-into-two-functions

Split epfn helper into unary and binary variants

Author: pavpanchekha

ops/core.rkt

@@ -14,7 +14,8 @@
          mk-big-ival
          new-ival
          ival-maybe
-         epfn
+         epunary
+         epbinary
          split-ival
          ival-max-prec
          ival-exact-neg
@@ -247,11 +248,14 @@
            (or xerr? yerr?)
            (and xerr yerr))]))
 
-;; This function computes and propagates the immovable? flag for endpoints
-(define (epfn op . args)
-  (define args-bf (map endpoint-val args))
-  (define-values (result exact?) (bf-return-exact? op args-bf))
-  (endpoint result (and (andmap endpoint-immovable? args) exact?)))
+;; These functions compute and propagate the immovable? flag for endpoints
+(define (epunary op arg)
+  (define-values (result exact?) (bf-return-exact? op (list (endpoint-val arg))))
+  (endpoint result (and (endpoint-immovable? arg) exact?)))
+
+(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?)))
 
 (define (epunary! out mpfr-fun! a-endpoint rnd)
   (match-define (endpoint a a!) a-endpoint)
@@ -296,11 +300,11 @@
 
 (define ((monotonic bffn) x)
   (match-define (ival lo hi err? err) x)
-  (ival (rnd 'down epfn bffn lo) (rnd 'up epfn 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 epfn bffn hi) (rnd 'up epfn 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)
@@ -677,8 +681,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 epfn bfneg xhi) (rnd 'up epfn bfcopy xhi) err? err)]
-    [(#t #f) (ival (rnd 'down epfn bfneg xhi) (rnd 'up epfn 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 epfn fn lo) err? err)
-                 (ival (endpoint ymin #f) (rnd 'up epfn 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
-                     epfn
+                     epbinary
                      bfmin2
-                     (epfn (curry bfcosu n) (ival-lo x))
-                     (epfn (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
-                     epfn
+                     epbinary
                      bfmax2
-                     (epfn (curry bfcosu n) (ival-lo x))
-                     (epfn (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
-                     epfn
+                     epbinary
                      bfmin2
-                     (epfn (curry bfcosu n) (ival-lo x))
-                     (epfn (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 epfn bfmin2 (epfn bfcos (ival-lo x)) (epfn 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 epfn bfmax2 (epfn bfcos (ival-lo x)) (epfn 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 epfn bfmin2 (epfn bfcos (ival-lo x)) (epfn 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
-                     epfn
+                     epbinary
                      bfmax2
-                     (epfn (curry bfsinu n) (ival-lo x))
-                     (epfn (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
-                     epfn
+                     epbinary
                      bfmin2
-                     (epfn (curry bfsinu n) (ival-lo x))
-                     (epfn (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 epfn bfmax2 (epfn bfsin (ival-lo x)) (epfn 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 epfn bfmin2 (epfn bfsin (ival-lo x)) (epfn 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))]