remove +c and -c

lbressler13 · May 16, 2024 · 431e97b · 431e97b
1 parent e0bb89b
commit 431e97b
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 8 deletions.
diff --git a/kotlin-utils/build.gradle.kts b/kotlin-utils/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
 }
 
 group = "xyz.lbres"
-version = "1.4.4"
+version = "1.4.4-android"
 
 repositories {
     mavenCentral()

diff --git a/kotlin-utils/src/main/kotlin/xyz/lbres/kotlinutils/set/multiset/const/ConstMultiSet.kt b/kotlin-utils/src/main/kotlin/xyz/lbres/kotlinutils/set/multiset/const/ConstMultiSet.kt
@@ -23,11 +23,6 @@ sealed class ConstMultiSet<E> : MultiSet<E> {
     override fun minus(other: MultiSet<E>): MultiSet<E> = performMinus(_counts, other)
     override fun intersect(other: MultiSet<E>): MultiSet<E> = performIntersect(_counts, other)
 
-    @Suppress(Suppressions.FUNCTION_NAME)
-    infix fun `+c`(other: ConstMultiSet<E>): ConstMultiSet<E> = plusC(other)
-    @Suppress(Suppressions.FUNCTION_NAME)
-    infix fun `-c`(other: ConstMultiSet<E>): ConstMultiSet<E> = minusC(other)
-
     /**
      * Alternate version of [plus], which returns a ConstMultiSet
      *

diff --git a/...in-utils/src/test/kotlin/xyz/lbres/kotlinutils/set/multiset/testutils/commonMinusTests.kt b/...in-utils/src/test/kotlin/xyz/lbres/kotlinutils/set/multiset/testutils/commonMinusTests.kt
@@ -20,7 +20,7 @@ private val genericMinus: MultiSetOp<*> = { set1: MultiSet<Any>, set2: MultiSet<
 private val genericConstMinus: MultiSetOp<*> = { set1: MultiSet<Any>, set2: MultiSet<Any> ->
     set1 as ConstMultiSet<Any>
     set2 as ConstMultiSet<Any>
-    set1 `-c` set2
+    set1.minusC(set2)
 } as MultiSetOp<*>
 
 fun runMinusTests(createSet: (Collection<*>) -> MultiSet<*>, createOtherSet: (Collection<*>) -> MultiSet<*>, const: Boolean) {

diff --git a/kotlin-utils/src/test/kotlin/xyz/lbres/kotlinutils/set/multiset/testutils/commonPlusTests.kt b/kotlin-utils/src/test/kotlin/xyz/lbres/kotlinutils/set/multiset/testutils/commonPlusTests.kt
@@ -20,7 +20,7 @@ private val genericPlus: MultiSetOp<*> = { set1: MultiSet<Any>, set2: MultiSet<A
 private val genericConstPlus: MultiSetOp<*> = { set1: MultiSet<Any>, set2: MultiSet<Any> ->
     set1 as ConstMultiSet<Any>
     set2 as ConstMultiSet<Any>
-    set1 `+c` set2
+    set1.plusC(set2)
 } as MultiSetOp<*>
 
 fun runPlusTests(createSet: (Collection<*>) -> MultiSet<*>, createOtherSet: (Collection<*>) -> MultiSet<*>, const: Boolean) {