Refactor set benchmark generators

Author: Abduqodiri Qurbonzoda

benchmarks-libraries/src/main/kotlin/generators/benchmarkSourceGenerator.kt

@@ -141,19 +141,19 @@ private val mapBuilderImpls = listOf(
 )
 
 private val setImpls = listOf(
-        SetKotlinBenchmark(),
-        SetKotlinOrderedBenchmark(),
-        SetCapsuleBenchmark(),
-        SetCyclopsBenchmark(),
-        SetCyclopsTrieBenchmark(),
-        SetCyclopsSortedBenchmark(),
-        SetClojureBenchmark(),
-        SetClojureSortedBenchmark(),
-        SetScalaBenchmark(),
-        SetScalaSortedBenchmark(),
-        SetVavrBenchmark(),
-        SetVavrSortedBenchmark(),
-        SetVavrOrderedBenchmark()
+        KotlinSetImplementation,
+        KotlinOrderedSetImplementation,
+        CapsuleSetImplementation,
+        CyclopsSetImplementation,
+        CyclopsTrieSetImplementation,
+        CyclopsSortedSetImplementation,
+        ClojureSetImplementation,
+        ClojureSortedSetImplementation,
+        ScalaSetImplementation,
+        ScalaSortedSetImplementation,
+        VavrSetImplementation,
+        VavrSortedSetImplementation,
+        VavrOrderedSetImplementation
 )
 private val setBuilderImpls = listOf(
         SetBuilderKotlinBenchmark(),
@@ -223,12 +223,19 @@ fun generateBenchmarks() {
             mapBuilderImpls.filterIsInstance<MapBuilderRemoveBenchmark>().map { MapBuilderRemoveBenchmarkGenerator(it) }
     )*/
 
-    val setBenchmarks = listOf(
+    val setBenchmarks = setImpls.map { listOf(
+            SetAddBenchmarkGenerator(it),
+            SetContainsBenchmarkGenerator(it),
+            SetIterateBenchmarkGenerator(it),
+            SetRemoveBenchmarkGenerator(it),
+            SetUtilsGenerator(it)
+    ) }
+    /*listOf(
             setImpls.filterIsInstance<SetAddBenchmark>().map { SetAddBenchmarkGenerator(it) },
             setImpls.filterIsInstance<SetContainsBenchmark>().map { SetContainsBenchmarkGenerator(it) },
             setImpls.filterIsInstance<SetIterateBenchmark>().map { SetIterateBenchmarkGenerator(it) },
             setImpls.filterIsInstance<SetRemoveBenchmark>().map { SetRemoveBenchmarkGenerator(it) }
-    )
+    )*/
     val setBuilderBenchmarks = listOf(
             setBuilderImpls.filterIsInstance<SetBuilderAddBenchmark>().map { SetBuilderAddBenchmarkGenerator(it) },
             setBuilderImpls.filterIsInstance<SetBuilderContainsBenchmark>().map { SetBuilderContainsBenchmarkGenerator(it) },
@@ -250,15 +257,14 @@ fun generateBenchmarks() {
 }
 
 fun generateUtils() {
-    val setUtils = setImpls.filterIsInstance<SetBenchmarkUtils>().map { SetUtilsGenerator(it) }
     val setBuilderUtils = setBuilderImpls.filterIsInstance<SetBuilderBenchmarkUtils>().map { SetBuilderUtilsGenerator(it) }
 
     val commonUtils = listOf(
             IntWrapperGenerator(),
             CommonUtilsGenerator()
     )
 
-    val utils = setUtils + setBuilderUtils + commonUtils
+    val utils = setBuilderUtils + commonUtils
 
     utils.forEach { util ->
         val path = util.getPackage().replace('.', '/') + "/" + util.outputFileName + ".kt"

benchmarks-libraries/src/main/kotlin/generators/immutableSet/addGenerator.kt

@@ -19,12 +19,7 @@ package generators.immutableSet
 import generators.BenchmarkSourceGenerator
 import java.io.PrintWriter
 
-interface SetAddBenchmark {
-    val packageName: String
-    fun setType(E: String): String
-}
-
-class SetAddBenchmarkGenerator(private val impl: SetAddBenchmark) : BenchmarkSourceGenerator() {
+class SetAddBenchmarkGenerator(private val impl: SetImplementation) : BenchmarkSourceGenerator() {
     override val outputFileName: String = "Add"
 
     override fun getPackage(): String {
@@ -42,15 +37,15 @@ open class Add {
     @Param(ASCENDING_HASH_CODE, RANDOM_HASH_CODE, COLLISION_HASH_CODE)
     var hashCodeType = ""
 
-    private var elements = listOf<IntWrapper>()
+    private var elements = listOf<$setElementType>()
 
     @Setup(Level.Trial)
     fun prepare() {
         elements = generateElements(hashCodeType, size)
     }
 
     @Benchmark
-    fun add(): ${impl.setType("IntWrapper")} {
+    fun add(): ${impl.type()} {
         return persistentSetAdd(elements)
     }
 

benchmarks-libraries/src/main/kotlin/generators/immutableSet/containsGenerator.kt

@@ -19,12 +19,7 @@ package generators.immutableSet
 import generators.BenchmarkSourceGenerator
 import java.io.PrintWriter
 
-interface SetContainsBenchmark {
-    val packageName: String
-    fun emptyOf(E: String): String
-}
-
-class SetContainsBenchmarkGenerator(private val impl: SetContainsBenchmark) : BenchmarkSourceGenerator() {
+class SetContainsBenchmarkGenerator(private val impl: SetImplementation) : BenchmarkSourceGenerator() {
     override val outputFileName: String = "Contains"
 
     override fun getPackage(): String {
@@ -42,8 +37,8 @@ open class Contains {
     @Param(ASCENDING_HASH_CODE, RANDOM_HASH_CODE, COLLISION_HASH_CODE, NON_EXISTING_HASH_CODE)
     var hashCodeType = ""
 
-    private var elements = listOf<IntWrapper>()
-    private var persistentSet = ${impl.emptyOf("IntWrapper")}
+    private var elements = listOf<$setElementType>()
+    private var persistentSet = ${impl.empty()}
 
     @Setup(Level.Trial)
     fun prepare() {

benchmarks-libraries/src/main/kotlin/generators/immutableSet/impl/capsule.kt

@@ -18,20 +18,17 @@ package generators.immutableSet.impl
 
 import generators.immutableSet.*
 
-class SetCapsuleBenchmark:
-        SetContainsBenchmark,
-        SetIterateBenchmark,
-        SetAddBenchmark,
-        SetRemoveBenchmark,
-        SetBenchmarkUtils
-{
-    override val packageName: String = "capsule"
+object CapsuleSetImplementation: SetImplementation {
+    override val packageName: String
+            = "capsule"
 
-    override fun setType(E: String): String = "io.usethesource.capsule.Set.Immutable<$E>"
+    override fun type(): String
+            = "io.usethesource.capsule.Set.Immutable<$setElementType>"
+    override fun empty(): String
+            = "io.usethesource.capsule.core.PersistentTrieSet.of<$setElementType>()"
 
-    override fun emptyOf(E: String): String = "io.usethesource.capsule.core.PersistentTrieSet.of<$E>()"
-
-    override fun addOperation(set: String, element: String): String = "$set.__insert($element)"
-
-    override fun removeOperation(set: String, element: String): String = "$set.__remove($element)"
+    override fun addOperation(set: String, element: String): String
+            = "$set.__insert($element)"
+    override fun removeOperation(set: String, element: String): String
+            = "$set.__remove($element)"
 }

benchmarks-libraries/src/main/kotlin/generators/immutableSet/impl/clojure.kt

@@ -18,20 +18,17 @@ package generators.immutableSet.impl
 
 import generators.immutableSet.*
 
-class SetClojureBenchmark:
-        SetContainsBenchmark,
-        SetIterateBenchmark,
-        SetAddBenchmark,
-        SetRemoveBenchmark,
-        SetBenchmarkUtils
-{
-    override val packageName: String = "clojure"
+object ClojureSetImplementation: SetImplementation {
+    override val packageName: String
+            = "clojure"
 
-    override fun setType(E: String): String = "clojure.lang.PersistentHashSet"
+    override fun type(): String
+            = "clojure.lang.PersistentHashSet"
+    override fun empty(): String
+            = "clojure.lang.PersistentHashSet.EMPTY"
 
-    override fun emptyOf(E: String): String = "clojure.lang.PersistentHashSet.EMPTY"
-
-    override fun addOperation(set: String, element: String): String = "$set.cons($element) as clojure.lang.PersistentHashSet"
-
-    override fun removeOperation(set: String, element: String): String = "$set.disjoin($element) as clojure.lang.PersistentHashSet"
+    override fun addOperation(set: String, element: String): String
+            = "$set.cons($element) as clojure.lang.PersistentHashSet"
+    override fun removeOperation(set: String, element: String): String
+            = "$set.disjoin($element) as clojure.lang.PersistentHashSet"
 }

benchmarks-libraries/src/main/kotlin/generators/immutableSet/impl/clojureSorted.kt

@@ -18,20 +18,17 @@ package generators.immutableSet.impl
 
 import generators.immutableSet.*
 
-class SetClojureSortedBenchmark:
-        SetContainsBenchmark,
-        SetIterateBenchmark,
-        SetAddBenchmark,
-        SetRemoveBenchmark,
-        SetBenchmarkUtils
-{
-    override val packageName: String = "clojureSorted"
+object ClojureSortedSetImplementation: SetImplementation {
+    override val packageName: String
+            = "clojureSorted"
 
-    override fun setType(E: String): String = "clojure.lang.PersistentTreeSet"
+    override fun type(): String
+            = "clojure.lang.PersistentTreeSet"
+    override fun empty(): String
+            = "clojure.lang.PersistentTreeSet.EMPTY"
 
-    override fun emptyOf(E: String): String = "clojure.lang.PersistentTreeSet.EMPTY"
-
-    override fun addOperation(set: String, element: String): String = "$set.cons($element) as clojure.lang.PersistentTreeSet"
-
-    override fun removeOperation(set: String, element: String): String = "$set.disjoin($element) as clojure.lang.PersistentTreeSet"
+    override fun addOperation(set: String, element: String): String
+            = "$set.cons($element) as clojure.lang.PersistentTreeSet"
+    override fun removeOperation(set: String, element: String): String
+            = "$set.disjoin($element) as clojure.lang.PersistentTreeSet"
 }

benchmarks-libraries/src/main/kotlin/generators/immutableSet/impl/cyclops.kt

@@ -18,20 +18,17 @@ package generators.immutableSet.impl
 
 import generators.immutableSet.*
 
-class SetCyclopsBenchmark:
-        SetContainsBenchmark,
-        SetIterateBenchmark,
-        SetAddBenchmark,
-        SetRemoveBenchmark,
-        SetBenchmarkUtils
-{
-    override val packageName: String = "cyclops"
+object CyclopsSetImplementation: SetImplementation {
+    override val packageName: String
+            = "cyclops"
 
-    override fun setType(E: String): String = "cyclops.data.HashSet<$E>"
+    override fun type(): String
+            = "cyclops.data.HashSet<$setElementType>"
+    override fun empty(): String
+            = "cyclops.data.HashSet.empty<$setElementType>()"
 
-    override fun emptyOf(E: String): String = "cyclops.data.HashSet.empty<$E>()"
-
-    override fun addOperation(set: String, element: String): String = "$set.add($element)"
-
-    override fun removeOperation(set: String, element: String): String = "$set.removeValue($element)"
+    override fun addOperation(set: String, element: String): String
+            = "$set.add($element)"
+    override fun removeOperation(set: String, element: String): String
+            = "$set.removeValue($element)"
 }

benchmarks-libraries/src/main/kotlin/generators/immutableSet/impl/cyclopsSorted.kt

@@ -18,20 +18,17 @@ package generators.immutableSet.impl
 
 import generators.immutableSet.*
 
-class SetCyclopsSortedBenchmark:
-        SetContainsBenchmark,
-        SetIterateBenchmark,
-        SetAddBenchmark,
-        SetRemoveBenchmark,
-        SetBenchmarkUtils
-{
-    override val packageName: String = "cyclopsSorted"
+object CyclopsSortedSetImplementation: SetImplementation {
+    override val packageName: String
+            = "cyclopsSorted"
 
-    override fun setType(E: String): String = "cyclops.data.TreeSet<$E>"
+    override fun type(): String
+            = "cyclops.data.TreeSet<$setElementType>"
+    override fun empty(): String
+            = "cyclops.data.TreeSet.empty<$setElementType>()"
 
-    override fun emptyOf(E: String): String = "cyclops.data.TreeSet.empty<$E>()"
-
-    override fun addOperation(set: String, element: String): String = "$set.add($element)"
-
-    override fun removeOperation(set: String, element: String): String = "$set.removeValue($element)"
+    override fun addOperation(set: String, element: String): String
+            = "$set.add($element)"
+    override fun removeOperation(set: String, element: String): String
+            = "$set.removeValue($element)"
 }

benchmarks-libraries/src/main/kotlin/generators/immutableSet/impl/cyclopsTrie.kt

@@ -18,20 +18,17 @@ package generators.immutableSet.impl
 
 import generators.immutableSet.*
 
-class SetCyclopsTrieBenchmark:
-        SetContainsBenchmark,
-        SetIterateBenchmark,
-        SetAddBenchmark,
-        SetRemoveBenchmark,
-        SetBenchmarkUtils
-{
-    override val packageName: String = "cyclopsTrie"
+object CyclopsTrieSetImplementation: SetImplementation {
+    override val packageName: String
+            = "cyclopsTrie"
 
-    override fun setType(E: String): String = "cyclops.data.TrieSet<$E>"
+    override fun type(): String
+            = "cyclops.data.TrieSet<$setElementType>"
+    override fun empty(): String
+            = "cyclops.data.TrieSet.empty<$setElementType>()"
 
-    override fun emptyOf(E: String): String = "cyclops.data.TrieSet.empty<$E>()"
-
-    override fun addOperation(set: String, element: String): String = "$set.add($element)"
-
-    override fun removeOperation(set: String, element: String): String = "$set.removeValue($element)"
+    override fun addOperation(set: String, element: String): String
+            = "$set.add($element)"
+    override fun removeOperation(set: String, element: String): String
+            = "$set.removeValue($element)"
 }

benchmarks-libraries/src/main/kotlin/generators/immutableSet/impl/kotlin.kt

@@ -18,20 +18,17 @@ package generators.immutableSet.impl
 
 import generators.immutableSet.*
 
-class SetKotlinBenchmark:
-        SetContainsBenchmark,
-        SetIterateBenchmark,
-        SetAddBenchmark,
-        SetRemoveBenchmark,
-        SetBenchmarkUtils
-{
-    override val packageName: String = "kotlin"
+object KotlinSetImplementation: SetImplementation {
+    override val packageName: String
+            = "kotlin"
 
-    override fun setType(E: String): String = "kotlinx.collections.immutable.PersistentSet<$E>"
+    override fun type(): String
+            = "kotlinx.collections.immutable.PersistentSet<$setElementType>"
+    override fun empty(): String
+            = "kotlinx.collections.immutable.persistentHashSetOf<$setElementType>()"
 
-    override fun emptyOf(E: String): String = "kotlinx.collections.immutable.persistentHashSetOf<$E>()"
-
-    override fun addOperation(set: String, element: String): String = "$set.add($element)"
-
-    override fun removeOperation(set: String, element: String): String = "$set.remove($element)"
+    override fun addOperation(set: String, element: String): String
+            = "$set.add($element)"
+    override fun removeOperation(set: String, element: String): String
+            = "$set.remove($element)"
 }