From 7c2e7e39b41b98122994bcb68b0594e56f13af62 Mon Sep 17 00:00:00 2001
From: Max New <maxsnew@gmail.com>
Date: Mon, 31 Mar 2014 14:24:15 -0500
Subject: [PATCH] Add initial failing fair vec/e tests

---
 .../redex-lib/redex/private/enumerator.rkt    |  7 +++++
 .../redex/tests/enumerator-test.rkt           | 27 +++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/pkgs/redex-pkgs/redex-lib/redex/private/enumerator.rkt b/pkgs/redex-pkgs/redex-lib/redex/private/enumerator.rkt
index 69a5baf1b9..76e1b25e8d 100644
--- a/pkgs/redex-pkgs/redex-lib/redex/private/enumerator.rkt
+++ b/pkgs/redex-pkgs/redex-lib/redex/private/enumerator.rkt
@@ -34,6 +34,7 @@
          many/e
          many1/e
          list/e
+         vec/e
          traverse/e
          hash-traverse/e
          
@@ -798,6 +799,12 @@
 (define (many1/e e)
   (except/e (many/e e) '()))
 
+;; vec/e : listof (enum any) -> enum (vectorof any)
+(define (vec/e . es)
+  (map/e list->vector
+         vector->list
+         (list/e es)))
+
 ;; list/e : listof (enum any) -> enum (listof any)
 (define (list/e es)
   (define l (length es))
diff --git a/pkgs/redex-pkgs/redex-test/redex/tests/enumerator-test.rkt b/pkgs/redex-pkgs/redex-test/redex/tests/enumerator-test.rkt
index 02a50724f1..18e7274e37 100644
--- a/pkgs/redex-pkgs/redex-test/redex/tests/enumerator-test.rkt
+++ b/pkgs/redex-pkgs/redex-test/redex/tests/enumerator-test.rkt
@@ -199,6 +199,8 @@
                              (car ms))
                           (= (cdr ns)
                              (cdr ms)))))
+;; Make sure they are layered correctly, but don't care about the
+;; exact order
 
 ;; prod tests
 (test-begin
@@ -259,6 +261,31 @@
         (cons 1 1))
  (check-bijection? nats*nats))
 
+;; fair product tests
+(define-simple-check (check-range? e l u approx)
+  (let ([actual (for/set ([i (in-range l u)])
+                  (decode e i))]
+        [expected (list->set approx)])
+    (equal? actual expected)))
+(test-begin
+ (define n*n     (vec/e nats/e nats/e))
+ (check-range? n*n  0  1 '(#(0 0)))
+ (check-range? n*n  1  3 '(#(0 1) #(1 0)))
+ (check-range? n*n  3  6 '(#(0 2) #(1 1) #(2 0)))
+ (check-range? n*n  6 10 '(#(0 3) #(1 2) #(2 1) #(3 0)))
+ (check-range? n*n 10 15 '(#(0 4) #(1 3) #(2 2) #(3 1) #(4 0))))
+(test-begin
+ (define n*n*n   (vec/e nats/e nats/e nats/e))
+ (define n*n*n*n (vec/e nats/e nats/e nats/e nats/e))
+ 
+
+ (check-range? n*n*n  0  1 '(#(0 0 0)))
+ (check-range? n*n*n  1  4 '(#(0 0 1) #(0 1 0) #(1 0 0)))
+ (check-range? n*n*n  4 10 '(#(0 0 2) #(1 1 0) #(0 1 1) #(1 0 1) #(0 2 0) #(2 0 0)))
+ (check-range? n*n*n 10 20 '(#(0 0 3) #(0 3 0) #(3 0 0)
+                             #(0 1 2) #(1 0 2) #(0 2 1) #(1 2 0) #(2 0 1) #(2 1 0)
+                             #(1 1 1))))
+
 ;; multi-arg map/e test
 (define sums/e
   (map/e