aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Peter McGoron 2025-03-15 20:09:38 -0400
committerGravatar Peter McGoron 2025-03-15 20:09:38 -0400
commit8b651293d8c9ab6963400c3f35c5bea4703e5db2 (patch)
tree59104e18f0cecf67beadc8ddab98592910375055
parentcreate disjoint set generator of exact number of sets (diff)
test set-member with new generators
-rw-r--r--mcgoron/weight-balanced-trees/srfi/113/252.sld2
-rw-r--r--tests/srfi-113-sets.scm27
2 files changed, 16 insertions, 13 deletions
diff --git a/mcgoron/weight-balanced-trees/srfi/113/252.sld b/mcgoron/weight-balanced-trees/srfi/113/252.sld
index 94f5376..3c3219a 100644
--- a/mcgoron/weight-balanced-trees/srfi/113/252.sld
+++ b/mcgoron/weight-balanced-trees/srfi/113/252.sld
@@ -19,8 +19,10 @@
(srfi 1) (srfi 26) (srfi 128) (srfi 158) (srfi 194) (srfi 252))
(export default-max-set-size set-generator-of
default-max-number-of-sets
+ intersecting-sets-of-exactly
intersecting-set-generator-of-exactly
intersecting-set-generator-of
+ disjoint-sets-of-exactly
disjoint-set-generator-of-exactly
disjoint-set-generator-of)
(include "252.scm"))
diff --git a/tests/srfi-113-sets.scm b/tests/srfi-113-sets.scm
index 5a9da18..6fbba40 100644
--- a/tests/srfi-113-sets.scm
+++ b/tests/srfi-113-sets.scm
@@ -17,9 +17,9 @@
(define test-set-generator-of #f)
(define test-intersecting-set-generator-of #f)
(define test-disjoint-set-generator-of #f)
-(define test-set-every #t)
-(define test-set-contains #t)
-(define test-set-member #f)
+(define test-set-every #f)
+(define test-set-contains #f)
+(define test-set-member #t)
(define test-set-adjoin #f)
(define test-set-find #f)
(define test-set-disjoint #f)
@@ -334,7 +334,6 @@
(set-generator)
2)))))
-#|
;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;
;;; Set-member
;;;
@@ -351,16 +350,18 @@
set))
(test-property set-member-from (list (set-generator))))
(test-group "not set-member"
- (define (set-not-member vecs)
- (let ((set (list->set cmp (vector->list (list-ref vecs 0))))
- (not-in (list-ref vecs 1)))
- (vector-every
- (lambda (value)
- (eq? (set-member set value set-not-member)
- set-not-member))
- not-in)))
- (test-property set-not-member (list (split-unique-vectors)))))
+ (define (set-not-member sets)
+ (let ((set (list-ref sets 0))
+ (traversed-set (list-ref sets 1)))
+ (set-every? (lambda (value)
+ (eq? (set-member set value set-not-member)
+ set-not-member))
+ traversed-set)))
+ (test-property set-not-member (list (disjoint-set-generator-of-exactly
+ (set-generator)
+ 2)))))
+#|
;;; ;;;;;;;;;;;;;;;;;;;;;;;;;
;;; Set-adjoin
;;; ;;;;;;;;;;;;;;;;;;;;;;;;;