Merge pull request #116 from herbie-fp/rival-analyze-with-hints

Adding a separate function of `rival-analyze-with-hints`

Author: pavpanchekha

eval/main.rkt

@@ -14,6 +14,7 @@
          rival-compile
          rival-apply
          rival-analyze
+         rival-analyze-with-hints
          (struct-out exn:rival)
          (struct-out exn:rival:invalid)
          (struct-out exn:rival:unsamplable)
@@ -82,7 +83,7 @@
       [else (loop (+ 1 iter))])))
 
 ; Assumes that hint (if provided) is correct for the given rect
-(define (rival-analyze machine rect [hint #f])
+(define (rival-analyze-with-hints machine rect [hint #f])
   ; Load arguments
   (rival-machine-load machine rect)
   (define-values (good? done? bad? stuck? fvec)
@@ -91,3 +92,6 @@
   (define-values (hint* hint*-converged?)
     (make-hint machine (or hint (rival-machine-default-hint machine))))
   (list (ival (or bad? stuck?) (not good?)) hint* hint*-converged?))
+
+(define (rival-analyze machine rect)
+  (car (rival-analyze-with-hints machine rect)))

eval/tests.rkt

@@ -97,11 +97,11 @@
     (define no-hint-cnt 0)
     (for ([n (in-range number-of-random-hyperrects)])
       (define hyperrect (sample-hyperrect-within-bounds rect-lo rect-hi varc))
-      (match-define (list res hint converged?) (rival-analyze machine hyperrect))
+      (match-define (list res hint converged?) (rival-analyze-with-hints machine hyperrect))
 
       ; A little hack, the analyze below uses hint from the previous run
       ; The analyze results must be equal. If not, something wrong has happened
-      (match-define (list res* hint* converged?*) (rival-analyze machine hyperrect hint))
+      (match-define (list res* hint* converged?*) (rival-analyze-with-hints machine hyperrect hint))
 
       (with-check-info (['hyperrect hyperrect] ['hint hint])
                        (check-equal? hint hint*)

info.rkt

@@ -1,7 +1,7 @@
 #lang info
 
 (define collection "rival")
-(define version "2.0")
+(define version "2.2")
 (define license 'MIT)
 
 ;; Packaging information

main.rkt

@@ -97,8 +97,9 @@
            (->* (rival-machine? (vectorof value?))
                 ((or/c (vectorof any/c) boolean?))
                 (vectorof any/c))]
-          [rival-analyze
+          [rival-analyze-with-hints
            (->* (rival-machine? (vectorof ival?)) ((or/c (vectorof any/c) boolean?)) (listof any/c))]
+          [rival-analyze (-> rival-machine? (vectorof ival?) ival?)]
           [rival-profile (-> rival-machine? symbol? any/c)]
           [baseline-compile
            (-> (listof any/c) (listof symbol?) (listof discretization?) baseline-machine?)]