corrected docs and tests

This commit is contained in:
Simon Hafner
2014-02-01 16:07:44 -06:00
parent 2c5a2d07fb
commit 9f29bb8d9e
2 changed files with 11 additions and 15 deletions

View File

@@ -226,11 +226,11 @@ proc `$`*[A](s: TOrderedSet[A]): string =
dollarImpl()
proc `<`*[A](s, t: TSet[A]): bool =
## Is a a strict subset of b?
## Is s a strict subset of t?
s.counter != t.counter and s <= t
proc `<=`*[A](s, t: TSet[A]): bool =
## Is a a subset of b?
## Is s a subset of t?
result = false
if s.counter > t.counter: return
result = true

View File

@@ -1,16 +1,12 @@
import unittest
import sets
suite "sets":
test "equivalent or subset":
check toSet(@[1,2,3]) <= toSet(@[1,2,3,4])
check toSet(@[1,2,3]) <= toSet(@[1,2,3])
check(not(toSet(@[1,2,3]) <= toSet(@[1,2])))
test "strict subset":
check toSet(@[1,2,3]) <= toSet(@[1,2,3,4])
check(not(toSet(@[1,2,3]) < toSet(@[1,2,3])))
check(not(toSet(@[1,2,3]) < toSet(@[1,2])))
test "==":
check(not(toSet(@[1,2,3]) == toSet(@[1,2,3,4])))
check toSet(@[1,2,3]) == toSet(@[1,2,3])
check(not(toSet(@[1,2,3]) == toSet(@[1,2])))
doAssert(toSet(@[1,2,3]) <= toSet(@[1,2,3,4]), "equivalent or subset")
doAssert(toSet(@[1,2,3]) <= toSet(@[1,2,3]), "equivalent or subset")
doAssert((not(toSet(@[1,2,3]) <= toSet(@[1,2]))), "equivalent or subset")
doAssert(toSet(@[1,2,3]) <= toSet(@[1,2,3,4]), "strict subset")
doAssert((not(toSet(@[1,2,3]) < toSet(@[1,2,3]))), "strict subset")
doAssert((not(toSet(@[1,2,3]) < toSet(@[1,2]))), "strict subset")
doAssert((not(toSet(@[1,2,3]) == toSet(@[1,2,3,4]))), "==")
doAssert(toSet(@[1,2,3]) == toSet(@[1,2,3]), "==")
doAssert((not(toSet(@[1,2,3]) == toSet(@[1,2]))), "==")