diff options
| author | Andreas Rumpf <rumpf_a@web.de> | 2014-06-26 21:02:10 +0200 |
|---|---|---|
| committer | Andreas Rumpf <rumpf_a@web.de> | 2014-06-26 21:02:10 +0200 |
| commit | cb09723033100f2c2a32d0a9a9b12ea824dc26a8 (patch) | |
| tree | ad20c7332a90481d5dfa3a1db724be4fc04b9514 /tests/sets | |
| parent | 8c93d3e1f9ddedc83d1fc90c5b938343cfe1d36f (diff) | |
| parent | ac3f872fa3a29effc1338008f45fe3d7332efc0e (diff) | |
| download | Nim-cb09723033100f2c2a32d0a9a9b12ea824dc26a8.tar.gz | |
Merge pull request #1308 from flyx/tset_additions
Logical operations for TSet
Diffstat (limited to 'tests/sets')
| -rw-r--r-- | tests/sets/tsets3.nim | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/tests/sets/tsets3.nim b/tests/sets/tsets3.nim index 5d14a1d8f..d2b15d72d 100644 --- a/tests/sets/tsets3.nim +++ b/tests/sets/tsets3.nim @@ -8,8 +8,8 @@ let block union: let s1_s2 = union(s1, s2) - s1_s3 = s1 or s3 - s2_s3 = s2 or s3 + s1_s3 = s1 + s3 + s2_s3 = s2 + s3 assert s1_s2.len == 7 assert s1_s3.len == 8 @@ -25,14 +25,14 @@ block union: assert i in s1_s3 assert i in s2_s3 - assert((s1 or s1) == s1) - assert((s2 or s1) == s1_s2) + assert((s1 + s1) == s1) + assert((s2 + s1) == s1_s2) block intersection: let s1_s2 = intersection(s1, s2) s1_s3 = intersection(s1, s3) - s2_s3 = s2 and s3 + s2_s3 = s2 * s3 assert s1_s2.len == 3 assert s1_s3.len == 0 @@ -48,14 +48,14 @@ block intersection: assert i in s2 assert i in s3 - assert((s2 and s2) == s2) - assert((s3 and s2) == s2_s3) + assert((s2 * s2) == s2) + assert((s3 * s2) == s2_s3) block symmetricDifference: let s1_s2 = symmetricDifference(s1, s2) - s1_s3 = s1 xor s3 - s2_s3 = s2 xor s3 + s1_s3 = s1 -+- s3 + s2_s3 = s2 -+- s3 assert s1_s2.len == 4 assert s1_s3.len == 8 @@ -71,8 +71,8 @@ block symmetricDifference: assert i in s1_s3 xor i in s1 assert i in s2_s3 xor i in s2 - assert((s3 xor s3) == initSet[int]()) - assert((s3 xor s1) == s1_s3) + assert((s3 -+- s3) == initSet[int]()) + assert((s3 -+- s1) == s1_s3) block disjoint: assert(not disjoint(s1, s2)) |