fix intersection benchmarks for paguro, and show correct images for s…

…et union ops
lacuna · Oct 9, 2018 · 05d6dcb · 05d6dcb
1 parent b8a4003
commit 05d6dcb
Show file tree

Hide file tree

Showing 12 changed files with 9 additions and 11 deletions.
diff --git a/benchmarks/images/map_construct.png b/benchmarks/images/map_construct.png
diff --git a/benchmarks/images/map_difference.png b/benchmarks/images/map_difference.png
diff --git a/benchmarks/images/map_equals.png b/benchmarks/images/map_equals.png
diff --git a/benchmarks/images/map_intersection.png b/benchmarks/images/map_intersection.png
diff --git a/benchmarks/images/map_iterate.png b/benchmarks/images/map_iterate.png
diff --git a/benchmarks/images/map_lookup.png b/benchmarks/images/map_lookup.png
diff --git a/benchmarks/images/map_union.png b/benchmarks/images/map_union.png
diff --git a/benchmarks/images/set_difference.png b/benchmarks/images/set_difference.png
diff --git a/benchmarks/images/set_intersection.png b/benchmarks/images/set_intersection.png
diff --git a/benchmarks/images/set_union.png b/benchmarks/images/set_union.png
diff --git a/doc/comparison.md b/doc/comparison.md
@@ -102,13 +102,11 @@ This compares set operations on maps whose keys half-overlap.  Using its canonic
 
 ## hash sets
 
-Since every hash set shared an implementation with their respective hash map, they demonstrate the same performance as shown above.
+Since every hash set shares an implementation with their respective hash map, they have similar performance characteristics to those shown above.  Some libraries, however, provide special paths for set operations on hash sets:
 
-Scala, however, has clearly optimized for set operations on their hash sets specifically, as they are comparable to Bifurcan across the board:
-
-![](../benchmarks/images/sorted_map_union.png)
-![](../benchmarks/images/sorted_map_intersection.png)
-![](../benchmarks/images/sorted_map_difference.png)
+![](../benchmarks/images/set_union.png)
+![](../benchmarks/images/set_intersection.png)
+![](../benchmarks/images/set_difference.png)
 
 ## sorted maps
 

diff --git a/test/bifurcan/benchmark_test.clj b/test/bifurcan/benchmark_test.clj
@@ -380,8 +380,8 @@
 
 (defn intersect-paguro-sorted-map [^PersistentTreeMap a ^PersistentTreeMap b]
   (let-mutable [a a]
-    (doit [k (.keySet b)]
-      (when-not (.containsKey ^PersistentTreeMap a k)
+    (doit [k (.keySet ^PersistentTreeMap a)]
+      (when-not (.containsKey ^PersistentTreeMap b k)
         (set! a (.without ^PersistentTreeMap a k))))
     a))
 
@@ -414,8 +414,8 @@
 
 (defn intersect-paguro-set [^PersistentHashSet a ^PersistentHashSet b]
   (let-mutable [a (.mutable a)]
-    (doit [k b]
-      (when-not (.contains ^PersistentHashSet$MutableHashSet a k)
+    (doit [k a]
+      (when-not (.contains b k)
         (set! a (.without ^PersistentHashSet$MutableHashSet a k))))
     a))
 
@@ -477,7 +477,7 @@
 
 (defn insert-string [^String a ^String b ^long idx]
   (let [idx (.offsetByCodePoints a 0 idx)]
-a    (.concat
+    (.concat
       (.concat
         (.substring a 0 idx)
         b)