From 431e97bff8005fd6b05e04dbce374525bbb1668d Mon Sep 17 00:00:00 2001 From: lbressler13 Date: Thu, 16 May 2024 02:16:34 -0400 Subject: [PATCH] remove +c and -c --- kotlin-utils/build.gradle.kts | 2 +- .../lbres/kotlinutils/set/multiset/const/ConstMultiSet.kt | 5 ----- .../kotlinutils/set/multiset/testutils/commonMinusTests.kt | 2 +- .../kotlinutils/set/multiset/testutils/commonPlusTests.kt | 2 +- 4 files changed, 3 insertions(+), 8 deletions(-) diff --git a/kotlin-utils/build.gradle.kts b/kotlin-utils/build.gradle.kts index d73d09c..72aba3a 100644 --- 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 index c5014a7..d475750 100644 --- 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 : MultiSet { override fun minus(other: MultiSet): MultiSet = performMinus(_counts, other) override fun intersect(other: MultiSet): MultiSet = performIntersect(_counts, other) - @Suppress(Suppressions.FUNCTION_NAME) - infix fun `+c`(other: ConstMultiSet): ConstMultiSet = plusC(other) - @Suppress(Suppressions.FUNCTION_NAME) - infix fun `-c`(other: ConstMultiSet): ConstMultiSet = minusC(other) - /** * Alternate version of [plus], which returns a ConstMultiSet * diff --git a/kotlin-utils/src/test/kotlin/xyz/lbres/kotlinutils/set/multiset/testutils/commonMinusTests.kt b/kotlin-utils/src/test/kotlin/xyz/lbres/kotlinutils/set/multiset/testutils/commonMinusTests.kt index 8bbbd5b..461f899 100644 --- a/kotlin-utils/src/test/kotlin/xyz/lbres/kotlinutils/set/multiset/testutils/commonMinusTests.kt +++ b/kotlin-utils/src/test/kotlin/xyz/lbres/kotlinutils/set/multiset/testutils/commonMinusTests.kt @@ -20,7 +20,7 @@ private val genericMinus: MultiSetOp<*> = { set1: MultiSet, set2: MultiSet< private val genericConstMinus: MultiSetOp<*> = { set1: MultiSet, set2: MultiSet -> set1 as ConstMultiSet set2 as ConstMultiSet - 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 index dae566a..37ecc41 100644 --- 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, set2: MultiSet = { set1: MultiSet, set2: MultiSet -> set1 as ConstMultiSet set2 as ConstMultiSet - set1 `+c` set2 + set1.plusC(set2) } as MultiSetOp<*> fun runPlusTests(createSet: (Collection<*>) -> MultiSet<*>, createOtherSet: (Collection<*>) -> MultiSet<*>, const: Boolean) {