Merged github issue functionaljava#13

mperry · mperry · commit d0dc441bd944 · 2014-06-02T21:59:55.000+10:00
diff --git a/core/src/main/java/fj/data/TreeMap.java b/core/src/main/java/fj/data/TreeMap.java
@@ -60,9 +60,7 @@ public Option<V> get(final K k) {
    * @return A new tree map with the given value mapped to the given key.
    */
   public TreeMap<K, V> set(final K k, final V v) {
-    final P3<Set<P2<K, Option<V>>>, Option<P2<K, Option<V>>>, Set<P2<K, Option<V>>>> x
-        = tree.split(P.p(k, Option.<V>none()));
-    return new TreeMap<K, V>(x._1().union(x._3().insert(P.p(k, Option.some(v)))));
+      return new TreeMap<K, V>(tree.insert(P.p(k, Option.some(v))));
   }
 
   /**
diff --git a/core/src/test/java/fj/data/TestTreeMap.java b/core/src/test/java/fj/data/TestTreeMap.java
@@ -0,0 +1,26 @@
+package fj.data;
+
+import fj.Ord;
+import fj.P2;
+import org.junit.Test;
+
+import java.util.ArrayList;
+
+/**
+ * Created by MarkPerry on 2/06/2014.
+ */
+public class TestTreeMap {
+
+    @Test
+    public void testLargeInserts() {
+        // check that inserting a large number of items performs ok
+        // taken from https://code.google.com/p/functionaljava/issues/detail?id=31 and
+        // https://github.com/functionaljava/functionaljava/pull/13/files
+        final int n = 10000;
+        TreeMap<Integer, String> m = TreeMap.empty(Ord.intOrd);
+        for (int i = 0; i < n; i++) {
+            m = m.set(i, "abc " + i);
+        }
+    }
+
+}
