More fixes

Author: bksaiki

src/interface.rkt

@@ -40,17 +40,17 @@
 
 (define (shift bits fn)
   (define shift-val (expt 2 bits))
-  (λ (x) (fn (- x shift-val))))
+  (λ (x) (+ (fn x) shift-val)))
 
 (define (unshift bits fn)
   (define shift-val (expt 2 bits))
-  (λ (x) (+ (fn x) shift-val)))
+  (λ (x) (fn (- x shift-val))))
 
 (define-representation (binary64 real)
   bigfloat->flonum
   bf
-  (shift 63 ordinal->flonum)
-  (unshift 63 flonum->ordinal)
+  (unshift 63 ordinal->flonum)
+  (shift 63 flonum->ordinal)
   64
   '(+nan.0 +inf.0 -inf.0))
 

src/web/common.rkt

@@ -14,11 +14,10 @@
 
 (define (fpcore->string core)
   (match-define (list 'FPCore args props ... expr) core)
-  (define props*
-    (for/list ([val (apply dict-set* '() props)])
+  (define props*  ; make sure each property (name, value) gets put on the same line
+    (for/list ([val (apply dict-set* '() props)]) ; how to make a list of pairs from a list
       (format "~a ~a" (car val) (cdr val))))
-  (with-output-to-string
-    (λ () (pretty-display `(,(format "FPCore ~a" args) ,@props* ,expr)))))
+  (pretty-format `(,(format "FPCore ~a" args) ,@props* ,expr) #:mode 'display))
 
 (define/contract (render-menu sections links)
   (-> (listof (cons/c string? string?)) (listof (cons/c string? string?)) xexpr?)

src/web/plot.rkt

@@ -245,18 +245,24 @@
     (if (number? axis)
         (λ x (list-ref x axis))
         (eval-prog `(λ ,vars ,axis) 'fl)))
+
+   ; works for binary64, binary32 (probably not for posits)
+  (define-values (maxbound minbound)
+    (let ([hi (sub1 ((representation-repr->ordinal repr) (fl->repr +inf.0 repr)))]
+          [lo (add1 ((representation-repr->ordinal repr) (fl->repr -inf.0 repr)))])
+      (values ((representation-ordinal->repr repr) hi)
+              ((representation-ordinal->repr repr) lo))))
+
   (define eby (errors-by get-coord errs pts))
   (define histogram-f (histogram-function eby #:bin-size bin-size))
   (define (avg-fun x)
     (define h (histogram-f x))
     (/ (apply + (vector->list h)) (vector-length h)))
-  (define-values (min max) ; plot requires rational bounds
+  (define-values (min* max*) ; plot requires finite bounds
     (match* ((car (first eby)) (car (last eby)))
             [(x x) (values #f #f)]
-            [(x y)
-              (values (flmax (flnext -inf.0) (repr->fl x repr)) ; hence this trick
-                      (flmin (flprev +inf.0) (repr->fl y repr)))]))
-  (function avg-fun min max #:width 2 #:color (color-theme-fit color)))
+            [(x y) (values (max minbound x) (min maxbound y))])) ; hence this
+  (function avg-fun min* max* #:width 2 #:color (color-theme-fit color)))
 
 (define (error-mark x-val)
   (inverse (const x-val) #:color "gray" #:width 3))