From 5b883dab81e4ae3a8216ae6e622ca13cfadc0a1d Mon Sep 17 00:00:00 2001 From: Mark Raynsford Date: Wed, 20 Mar 2024 10:16:59 +0000 Subject: [PATCH] Use recommended code style for Kotlin. --- .../com/io7m/kabstand/core/IntervalB.kt | 3 +- .../com/io7m/kabstand/core/IntervalD.kt | 3 +- .../com/io7m/kabstand/core/IntervalI.kt | 4 +-- .../com/io7m/kabstand/core/IntervalL.kt | 7 ++-- .../com/io7m/kabstand/core/IntervalTree.kt | 34 +++++++++++++++---- 5 files changed, 37 insertions(+), 14 deletions(-) diff --git a/com.io7m.kabstand.core/src/main/kotlin/com/io7m/kabstand/core/IntervalB.kt b/com.io7m.kabstand.core/src/main/kotlin/com/io7m/kabstand/core/IntervalB.kt index 6d69c39..bce11b3 100644 --- a/com.io7m.kabstand.core/src/main/kotlin/com/io7m/kabstand/core/IntervalB.kt +++ b/com.io7m.kabstand.core/src/main/kotlin/com/io7m/kabstand/core/IntervalB.kt @@ -19,8 +19,7 @@ package com.io7m.kabstand.core import java.math.BigInteger data class IntervalB( - val lower: BigInteger, - val upper: BigInteger + val lower : BigInteger, val upper : BigInteger ) : IntervalType { init { diff --git a/com.io7m.kabstand.core/src/main/kotlin/com/io7m/kabstand/core/IntervalD.kt b/com.io7m.kabstand.core/src/main/kotlin/com/io7m/kabstand/core/IntervalD.kt index ce60205..3694d69 100644 --- a/com.io7m.kabstand.core/src/main/kotlin/com/io7m/kabstand/core/IntervalD.kt +++ b/com.io7m.kabstand.core/src/main/kotlin/com/io7m/kabstand/core/IntervalD.kt @@ -30,7 +30,8 @@ data class IntervalD( } override fun upperMaximum( - other : IntervalType) : IntervalType { + other : IntervalType + ) : IntervalType { return IntervalD( this.lower, Math.max(this.upper, other.upper()) diff --git a/com.io7m.kabstand.core/src/main/kotlin/com/io7m/kabstand/core/IntervalI.kt b/com.io7m.kabstand.core/src/main/kotlin/com/io7m/kabstand/core/IntervalI.kt index 546fe8d..d002fa1 100644 --- a/com.io7m.kabstand.core/src/main/kotlin/com/io7m/kabstand/core/IntervalI.kt +++ b/com.io7m.kabstand.core/src/main/kotlin/com/io7m/kabstand/core/IntervalI.kt @@ -17,8 +17,8 @@ package com.io7m.kabstand.core data class IntervalI( - val lower: Int, - val upper: Int + val lower : Int, + val upper : Int ) : IntervalType { init { diff --git a/com.io7m.kabstand.core/src/main/kotlin/com/io7m/kabstand/core/IntervalL.kt b/com.io7m.kabstand.core/src/main/kotlin/com/io7m/kabstand/core/IntervalL.kt index d252d30..579bcf3 100644 --- a/com.io7m.kabstand.core/src/main/kotlin/com/io7m/kabstand/core/IntervalL.kt +++ b/com.io7m.kabstand.core/src/main/kotlin/com/io7m/kabstand/core/IntervalL.kt @@ -17,8 +17,8 @@ package com.io7m.kabstand.core data class IntervalL( - val lower: Long, - val upper: Long + val lower : Long, + val upper : Long ) : IntervalType { init { @@ -26,7 +26,8 @@ data class IntervalL( } override fun overlaps( - other : IntervalType) : Boolean { + other : IntervalType + ) : Boolean { return (this.lower <= other.upper() && other.lower() <= this.upper) } diff --git a/com.io7m.kabstand.core/src/main/kotlin/com/io7m/kabstand/core/IntervalTree.kt b/com.io7m.kabstand.core/src/main/kotlin/com/io7m/kabstand/core/IntervalTree.kt index 38f679b..8953e5e 100644 --- a/com.io7m.kabstand.core/src/main/kotlin/com/io7m/kabstand/core/IntervalTree.kt +++ b/com.io7m.kabstand.core/src/main/kotlin/com/io7m/kabstand/core/IntervalTree.kt @@ -181,14 +181,24 @@ class IntervalTree> private constructor( when (current.left!!.balanceFactor()) { RIGHT_HEAVY, BALANCED_LEANING_RIGHT -> { - this.publish(IntervalTreeChangeType.Balanced("RL", current.interval)) + this.publish( + IntervalTreeChangeType.Balanced( + "RL", + current.interval + ) + ) this.rotateRL(current) } LEFT_HEAVY, BALANCED, BALANCED_LEANING_LEFT -> { - this.publish(IntervalTreeChangeType.Balanced("RR", current.interval)) + this.publish( + IntervalTreeChangeType.Balanced( + "RR", + current.interval + ) + ) this.rotateRR(current) } } @@ -198,14 +208,24 @@ class IntervalTree> private constructor( when (current.right!!.balanceFactor()) { LEFT_HEAVY, BALANCED_LEANING_LEFT -> { - this.publish(IntervalTreeChangeType.Balanced("LR", current.interval)) + this.publish( + IntervalTreeChangeType.Balanced( + "LR", + current.interval + ) + ) this.rotateLR(current) } RIGHT_HEAVY, BALANCED, BALANCED_LEANING_RIGHT -> { - this.publish(IntervalTreeChangeType.Balanced("LL", current.interval)) + this.publish( + IntervalTreeChangeType.Balanced( + "LL", + current.interval + ) + ) this.rotateLL(current) } } @@ -353,12 +373,14 @@ class IntervalTree> private constructor( IntervalComparison.LESS_THAN -> { current.takeOwnershipLeft( - this.create(current, current.left, interval)) + this.create(current, current.left, interval) + ) } IntervalComparison.MORE_THAN -> { current.takeOwnershipRight( - this.create(current, current.right, interval)) + this.create(current, current.right, interval) + ) } }