Add the parameter isSorted for the sequtils.deduplicate

This commit is contained in:
data-man 2018-12-07 02:17:40 +05:00
commit a38f353597
2 changed files with 22 additions and 3 deletions

View file

@ -65,6 +65,7 @@ proc enumToString*(enums: openArray[enum]): string =
- Added `macros.isInstantiationOf` for checking if the proc symbol - Added `macros.isInstantiationOf` for checking if the proc symbol
is instantiation of generic proc symbol. is instantiation of generic proc symbol.
- Added the parameter ``isSorted`` for the ``sequtils.deduplicate`` proc.
### Library changes ### Library changes

View file

@ -115,7 +115,7 @@ proc repeat*[T](x: T, n: Natural): seq[T] =
for i in 0 ..< n: for i in 0 ..< n:
result[i] = x result[i] = x
proc deduplicate*[T](s: openArray[T]): seq[T] = proc deduplicate*[T](s: openArray[T], isSorted: bool = false): seq[T] =
## Returns a new sequence without duplicates. ## Returns a new sequence without duplicates.
## ##
## Example: ## Example:
@ -129,8 +129,17 @@ proc deduplicate*[T](s: openArray[T]): seq[T] =
## assert unique1 == @[1, 3, 4, 2, 8] ## assert unique1 == @[1, 3, 4, 2, 8]
## assert unique2 == @["a", "c", "d"] ## assert unique2 == @["a", "c", "d"]
result = @[] result = @[]
for itm in items(s): if s.len > 0:
if not result.contains(itm): result.add(itm) if isSorted:
var prev = s[0]
result.add(prev)
for i in 1..s.high:
if s[i] != prev:
prev = s[i]
result.add(prev)
else:
for itm in items(s):
if not result.contains(itm): result.add(itm)
proc zip*[S, T](s1: openArray[S], s2: openArray[T]): seq[tuple[a: S, b: T]] = proc zip*[S, T](s1: openArray[S], s2: openArray[T]): seq[tuple[a: S, b: T]] =
## Returns a new sequence with a combination of the two input containers. ## Returns a new sequence with a combination of the two input containers.
@ -827,6 +836,7 @@ macro mapLiterals*(constructor, op: untyped;
when isMainModule: when isMainModule:
import strutils import strutils
from algorithm import sorted
# helper for testing double substitution side effects which are handled # helper for testing double substitution side effects which are handled
# by `evalOnceAs` # by `evalOnceAs`
@ -902,10 +912,18 @@ when isMainModule:
unique2 = deduplicate(dup2) unique2 = deduplicate(dup2)
unique3 = deduplicate(dup3) unique3 = deduplicate(dup3)
unique4 = deduplicate(dup4) unique4 = deduplicate(dup4)
unique5 = deduplicate(dup1.sorted, true)
unique6 = deduplicate(dup2, true)
unique7 = deduplicate(dup3.sorted, true)
unique8 = deduplicate(dup4, true)
assert unique1 == @[1, 3, 4, 2, 8] assert unique1 == @[1, 3, 4, 2, 8]
assert unique2 == @["a", "c", "d"] assert unique2 == @["a", "c", "d"]
assert unique3 == @[1, 3, 4, 2, 8] assert unique3 == @[1, 3, 4, 2, 8]
assert unique4 == @["a", "c", "d"] assert unique4 == @["a", "c", "d"]
assert unique5 == @[1, 2, 3, 4, 8]
assert unique6 == @["a", "c", "d"]
assert unique7 == @[1, 2, 3, 4, 8]
assert unique8 == @["a", "c", "d"]
block: # zip test block: # zip test
let let