fix: Github Issue #11

core/src/main/scala/scalax/collection/mutable/SimpleArraySet.scala

@@ -30,7 +30,7 @@ final class SimpleArraySet[A](override val hints: ArraySet.Hints)
   override def newBuilder   = new SimpleArraySet.CheckingBuilder   [A] (this)
   protected[collection]
   def newNonCheckingBuilder[B] = new SimpleArraySet.NonCheckingBuilder[A,B] (this)
-  override def clone = (newNonCheckingBuilder ++= (if (isHash) hashSet else arr)) result
+  override def clone = (newNonCheckingBuilder ++= this) result
   private var nextFree: Int = 0
   private var arr: Array[A] = _
   private var hashSet: ExtHashSet[A] = _

core/src/test/scala/scalax/collection/mutable/TArraySet.scala

@@ -1,112 +1,121 @@
-package scalax.collection
-package mutable
-
-import org.scalatest.Suite
-import org.scalatest.Informer
-import org.scalatest.matchers.ShouldMatchers
-
-import collection.mutable.{ListBuffer, Map => MutableMap, Set => MutableSet}
-
-import GraphPredef._, GraphEdge._
-import edge.LkDiEdge, edge.Implicits._
-import immutable.SortedArraySet
-
-import org.scalatest.junit.JUnitRunner
-import org.junit.runner.RunWith
-
-/** Tests [[ArraySet]]. */
-@RunWith(classOf[JUnitRunner])
-class TArraySetTest extends Suite with ShouldMatchers {
-  implicit val hints = ArraySet.Hints(4, 4, 12, 100)
-  class EdgeGenerator {
-    private var i = 0
-    def draw: LkDiEdge[Int] = { i += 1; LkDiEdge(1, 2)(i) }
-  }
-  def test_Growth {
-    val arr = ArraySet.emptyWithHints[LkDiEdge[Int]]
-    arr.capacity should be (hints.initialCapacity)
-
-    val edges = new EdgeGenerator
-    def add(numberOfAdditions: Int, expectedCapacity: Int) {
-      for (i <- 0 until numberOfAdditions) {
-        arr += edges.draw
-        arr.capacity should be (expectedCapacity)
-      }
-    }
-
-    var toAdd, nextCapacity = hints.initialCapacity
-    while (nextCapacity <= hints.hashTableThreshold) {
-      add(toAdd, nextCapacity)
-      nextCapacity += hints.capacityIncrement
-      toAdd = hints.capacityIncrement
-    }
-    add(1, 0)
-    arr.isArray should be (false)
-  }
-  def test_Compact {
-    val edges = new EdgeGenerator
-    val toAdd = hints.initialCapacity + 1
-    val arr = ArraySet.emptyWithHints[LkDiEdge[Int]] ++=
-              (for (i <- 1 to toAdd) yield edges.draw)
-    arr.compact
-    arr.capacity should be (toAdd)
-
-  }
-  def test_HashOnly {
-    val edges = new EdgeGenerator
-    val arr = ArraySet.emptyWithHints[LkDiEdge[Int]](ArraySet.Hints.HashOnly)
-    def check {
-      arr.isArray should be (false)
-      arr.capacity should be (0)
-    }
-    check
-
-    arr += edges.draw
-    check
-
-    arr.compact
-    check
-  }
-  def test_Hints0 {
-    val edges = new EdgeGenerator
-    val arr = ArraySet.emptyWithHints[LkDiEdge[Int]](ArraySet.Hints(0, 4, 8, 0))
-    arr += edges.draw
-    arr.capacity should be (4)
-  }
-  def test_Builder {
-    val edges = new EdgeGenerator
-    type E = LkDiEdge[Int]
-    val arr = ArraySet.emptyWithHints[E]
-    val size = hints.initialCapacity + 1
-    for (i <- 1 to size) arr += edges.draw
-
-    val taken = arr take size
-    taken.isInstanceOf[ArraySet[_]] should be (true)
-    taken should have size (size)
-
-    def setInterface[A](set: MutableSet[A], n: Int): MutableSet[A] = set take n 
-    setInterface(arr, size - 1).isInstanceOf[ArraySet[_]] should be (true)
-
-    val filtered0 = arr filter (_ => false)
-    filtered0.isInstanceOf[ArraySet[_]] should be (true)
-    taken should have size (size)
-    filtered0.hints.initialCapacity should equal (arr.size)
-
-    for (i <- 1 to hints.capacityIncrement) arr += edges.draw
-    val filteredEven = arr filter (_ % 2 == 0)
-    filteredEven.hints.initialCapacity should equal (arr.size)
-  }
-  def test_sorted {
-    val as = ArraySet(3,6,0,-3)
-    val sas = as.sorted
-    sas.              isInstanceOf[SortedArraySet[_]] should be (true)
-    sas.filter(_ < 0).isInstanceOf[SortedArraySet[_]] should be (true)
-    sas.toList should be (List(-3,0,3,6))
-    sas.from (1) should be (SortedArraySet(3,6))
-    sas.until(0) should be (SortedArraySet(-3))
-    sas.range(-10, 10) should be (sas)
-    sas.range(-10,  1) should be (SortedArraySet(-3,0))
-    sas.range(-10, -3) should be (SortedArraySet.empty[Int])
-    sas.range(-10, -4) should be (SortedArraySet.empty[Int])
-  }
+package scalax.collection
+package mutable
+
+import org.scalatest.Suite
+import org.scalatest.Informer
+import org.scalatest.matchers.ShouldMatchers
+
+import collection.mutable.{ListBuffer, Map => MutableMap, Set => MutableSet}
+
+import GraphPredef._, GraphEdge._
+import edge.LkDiEdge, edge.Implicits._
+import immutable.SortedArraySet
+
+import org.scalatest.junit.JUnitRunner
+import org.junit.runner.RunWith
+
+/** Tests [[ArraySet]]. */
+@RunWith(classOf[JUnitRunner])
+class TArraySetTest extends Suite with ShouldMatchers {
+  implicit val hints = ArraySet.Hints(4, 4, 12, 100)
+  class EdgeGenerator {
+    private var i = 0
+    def draw: LkDiEdge[Int] = { i += 1; LkDiEdge(1, 2)(i) }
+  }
+  def test_Growth {
+    val arr = ArraySet.emptyWithHints[LkDiEdge[Int]]
+    arr.capacity should be (hints.initialCapacity)
+
+    val edges = new EdgeGenerator
+    def add(numberOfAdditions: Int, expectedCapacity: Int) {
+      for (i <- 0 until numberOfAdditions) {
+        arr += edges.draw
+        arr.capacity should be (expectedCapacity)
+      }
+    }
+
+    var toAdd, nextCapacity = hints.initialCapacity
+    while (nextCapacity <= hints.hashTableThreshold) {
+      add(toAdd, nextCapacity)
+      nextCapacity += hints.capacityIncrement
+      toAdd = hints.capacityIncrement
+    }
+    add(1, 0)
+    arr.isArray should be (false)
+  }
+  def test_Compact {
+    val edges = new EdgeGenerator
+    val toAdd = hints.initialCapacity + 1
+    val arr = ArraySet.emptyWithHints[LkDiEdge[Int]] ++=
+              (for (i <- 1 to toAdd) yield edges.draw)
+    arr.compact
+    arr.capacity should be (toAdd)
+
+  }
+  def test_HashOnly {
+    val edges = new EdgeGenerator
+    val arr = ArraySet.emptyWithHints[LkDiEdge[Int]](ArraySet.Hints.HashOnly)
+    def check {
+      arr.isArray should be (false)
+      arr.capacity should be (0)
+    }
+    check
+
+    arr += edges.draw
+    check
+
+    arr.compact
+    check
+  }
+  def test_Hints0 {
+    val edges = new EdgeGenerator
+    val arr = ArraySet.emptyWithHints[LkDiEdge[Int]](ArraySet.Hints(0, 4, 8, 0))
+    arr += edges.draw
+    arr.capacity should be (4)
+  }
+  def test_Builder {
+    val edges = new EdgeGenerator
+    type E = LkDiEdge[Int]
+    val arr = ArraySet.emptyWithHints[E]
+    val size = hints.initialCapacity + 1
+    for (i <- 1 to size) arr += edges.draw
+
+    val taken = arr take size
+    taken.isInstanceOf[ArraySet[_]] should be (true)
+    taken should have size (size)
+
+    def setInterface[A](set: MutableSet[A], n: Int): MutableSet[A] = set take n 
+    setInterface(arr, size - 1).isInstanceOf[ArraySet[_]] should be (true)
+
+    val filtered0 = arr filter (_ => false)
+    filtered0.isInstanceOf[ArraySet[_]] should be (true)
+    taken should have size (size)
+    filtered0.hints.initialCapacity should equal (arr.size)
+
+    for (i <- 1 to hints.capacityIncrement) arr += edges.draw
+    val filteredEven = arr filter (_ % 2 == 0)
+    filteredEven.hints.initialCapacity should equal (arr.size)
+  }
+  def test_sorted {
+    val as = ArraySet(3,6,0,-3)
+    val sas = as.sorted
+    sas.              isInstanceOf[SortedArraySet[_]] should be (true)
+    sas.filter(_ < 0).isInstanceOf[SortedArraySet[_]] should be (true)
+    sas.toList should be (List(-3,0,3,6))
+    sas.from (1) should be (SortedArraySet(3,6))
+    sas.until(0) should be (SortedArraySet(-3))
+    sas.range(-10, 10) should be (sas)
+    sas.range(-10,  1) should be (SortedArraySet(-3,0))
+    sas.range(-10, -3) should be (SortedArraySet.empty[Int])
+    sas.range(-10, -4) should be (SortedArraySet.empty[Int])
+  }
+  def test_plusPlus {
+    val a = ArraySet.empty[Int]
+    val b = ArraySet(1)
+    val c = ArraySet(2)
+
+    a.clone should be ('isEmpty)
+    a ++ b  should be (b)
+    b ++ c  should be (b.toSet ++ c.toSet)
+  }
 }