summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAndreas Rumpf <rumpf_a@web.de>2018-12-12 16:30:00 +0100
committerGitHub <noreply@github.com>2018-12-12 16:30:00 +0100
commit9d8158687964e477f4a36a8de1f7a08e0392bdae (patch)
treed2bdb332c973d2f6d43391369229cc732642c74d
parent070bcf4cea28a3238089379f5884787b2084b2de (diff)
parenta1bf9fd2b6525e613899c5dc0380fb80021ee3e7 (diff)
downloadNim-9d8158687964e477f4a36a8de1f7a08e0392bdae.tar.gz
Merge pull request #9879 from data-man/sorted_deduplicate
Add the parameter isSorted for the sequtils.deduplicate
-rw-r--r--changelog.md2
-rw-r--r--lib/pure/collections/sequtils.nim24
2 files changed, 22 insertions, 4 deletions
diff --git a/changelog.md b/changelog.md
index 024109df9..1772652d6 100644
--- a/changelog.md
+++ b/changelog.md
@@ -86,10 +86,10 @@ proc enumToString*(enums: openArray[enum]): string =
 - Added `macros.isInstantiationOf` for checking if the proc symbol
   is instantiation of generic proc symbol.
 
+- Added the parameter ``isSorted`` for the ``sequtils.deduplicate`` proc.
 - There is a new stdlib mdoule `std/diff` to compute the famous "diff"
   of two texts by line.
 
-
 ### Library changes
 
 - The string output of `macros.lispRepr` proc has been tweaked
diff --git a/lib/pure/collections/sequtils.nim b/lib/pure/collections/sequtils.nim
index be10780ff..39ba6df49 100644
--- a/lib/pure/collections/sequtils.nim
+++ b/lib/pure/collections/sequtils.nim
@@ -115,7 +115,7 @@ proc repeat*[T](x: T, n: Natural): seq[T] =
   for i in 0 ..< n:
     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.
   ##
   ## Example:
@@ -129,8 +129,17 @@ proc deduplicate*[T](s: openArray[T]): seq[T] =
   ##   assert unique1 == @[1, 3, 4, 2, 8]
   ##   assert unique2 == @["a", "c", "d"]
   result = @[]
-  for itm in items(s):
-    if not result.contains(itm): result.add(itm)
+  if s.len > 0:
+    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]] =
   ## Returns a new sequence with a combination of the two input containers.
@@ -827,6 +836,7 @@ macro mapLiterals*(constructor, op: untyped;
 
 when isMainModule:
   import strutils
+  from algorithm import sorted
 
   # helper for testing double substitution side effects which are handled
   # by `evalOnceAs`
@@ -902,10 +912,18 @@ when isMainModule:
       unique2 = deduplicate(dup2)
       unique3 = deduplicate(dup3)
       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 unique2 == @["a", "c", "d"]
     assert unique3 == @[1, 3, 4, 2, 8]
     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
     let