Introduce korlibs-time module (#2045)

korge-foundation/build.gradle.kts

@@ -21,6 +21,7 @@ dependencies {
     //add("commonMainApi", libs.kotlinx.atomicfu)
     //add("commonTestApi", project(":korge-test"))
     add("commonTestApi", libs.kotlinx.coroutines.test)
+    add("commonMainApi", project(":korlibs-time"))
 }
 
 //korlibs.korge.gradle.generate.TemplateGenerator.synchronize(new File(projectDir, "template"))

korlibs-time/.gitignore

@@ -0,0 +1 @@
+/build

korlibs-time/build.gradle.kts

@@ -0,0 +1,11 @@
+import korlibs.*
+
+description = "Korlibs Time - Former Klock"
+
+project.extensions.extraProperties.properties.apply {
+    applyProjectProperties(
+        "https://raw.githubusercontent.com/korlibs/korge/main/korlibs-time",
+        "Public Domain",
+        "https://raw.githubusercontent.com/korlibs/korge/main/korlibs-time/LICENSE"
+    )
+}

korge-foundation/src/korlibs/time/DateTime.kt → korlibs-time/src/korlibs/time/DateTime.kt

@@ -1,6 +1,5 @@
 package korlibs.time
 
-import korlibs.math.*
 import korlibs.time.DateTime.Companion.EPOCH
 import korlibs.time.internal.*
 import kotlin.jvm.JvmInline
@@ -116,14 +115,14 @@ value class DateTime(
             second: Int = 0,
             milliseconds: Int = 0
         ): DateTime {
-            val clampedMonth = month.clamp(1, 12)
+            val clampedMonth = month.coerceIn(1, 12)
             return createUnchecked(
                 year = year,
                 month = clampedMonth,
-                day = day.clamp(1, Month(month).days(year)),
-                hour = hour.clamp(0, 23),
-                minute = minute.clamp(0, 59),
-                second = second.clamp(0, 59),
+                day = day.coerceIn(1, Month(month).days(year)),
+                hour = hour.coerceIn(0, 23),
+                minute = minute.coerceIn(0, 59),
+                second = second.coerceIn(0, 59),
                 milliseconds = milliseconds
             )
         }

korge-foundation/src/korlibs/time/DayOfWeek.kt → korlibs-time/src/korlibs/time/DayOfWeek.kt

@@ -1,14 +1,13 @@
 package korlibs.time
 
-import korlibs.math.*
 import korlibs.time.DayOfWeek.Friday
 import korlibs.time.DayOfWeek.Monday
 import korlibs.time.DayOfWeek.Saturday
 import korlibs.time.DayOfWeek.Sunday
 import korlibs.time.DayOfWeek.Thursday
 import korlibs.time.DayOfWeek.Tuesday
 import korlibs.time.DayOfWeek.Wednesday
-import korlibs.time.internal.Serializable
+import korlibs.time.internal.*
 
 /** Represents the day of the week. [Sunday], [Monday], [Tuesday], [Wednesday], [Thursday], [Friday], [Saturday]. */
 enum class DayOfWeek(

korge-foundation/src/korlibs/time/Frequency.kt → korlibs-time/src/korlibs/time/Frequency.kt

@@ -1,6 +1,5 @@
 package korlibs.time
 
-import korlibs.math.*
 import korlibs.time.internal.*
 import kotlin.jvm.*
 

korge-foundation/src/korlibs/time/Month.kt → korlibs-time/src/korlibs/time/Month.kt

@@ -1,20 +1,8 @@
 package korlibs.time
 
-import korlibs.math.*
-import korlibs.time.Month.April
-import korlibs.time.Month.August
-import korlibs.time.Month.December
-import korlibs.time.Month.February
-import korlibs.time.Month.January
-import korlibs.time.Month.July
-import korlibs.time.Month.June
-import korlibs.time.Month.March
-import korlibs.time.Month.May
-import korlibs.time.Month.November
-import korlibs.time.Month.October
-import korlibs.time.Month.September
-import korlibs.time.internal.Serializable
-import kotlin.math.abs
+import korlibs.time.Month.*
+import korlibs.time.internal.*
+import kotlin.math.*
 
 /** Represents one of the twelve months of the year. */
 enum class Month(

korge-foundation/src/korlibs/time/PatternDateFormat.kt → korlibs-time/src/korlibs/time/PatternDateFormat.kt

@@ -1,8 +1,7 @@
 package korlibs.time
 
-import korlibs.math.*
+import korlibs.time.internal.*
 import korlibs.time.internal.MicroStrReader
-import korlibs.time.internal.Serializable
 import korlibs.time.internal.increment
 import korlibs.time.internal.padded
 import korlibs.time.internal.readTimeZoneOffset

korge-foundation/src/korlibs/time/PatternTimeFormat.kt → korlibs-time/src/korlibs/time/PatternTimeFormat.kt

@@ -1,8 +1,7 @@
 package korlibs.time
 
-import korlibs.math.*
+import korlibs.time.internal.*
 import korlibs.time.internal.MicroStrReader
-import korlibs.time.internal.Serializable
 import korlibs.time.internal.increment
 import korlibs.time.internal.padded
 import korlibs.time.internal.substr

korge-foundation/src/korlibs/time/TimeSampler.kt → korlibs-time/src/korlibs/time/TimeSampler.kt

@@ -1,19 +1,17 @@
 package korlibs.time
 
-import korlibs.datastructure.*
-
 /**
  * Class to count the number of times a sample was added in a timeWindow
  */
 class TimeSampler(var timeWindow: TimeSpan = 1.seconds) {
-    private val events = DoubleDeque()
+    private val events = ArrayDeque<Double>()
 
     val count: Int get() = events.size
 
     fun add() {
         val now = DateTime.now()
         events.add(now.unixMillisDouble)
-        while (events.first < (now - timeWindow).unixMillisDouble) {
+        while (events.first() < (now - timeWindow).unixMillisDouble) {
             events.removeFirst()
         }
     }

korge-foundation/src/korlibs/time/TimeSpan.kt → korlibs-time/src/korlibs/time/TimeSpan.kt

@@ -1,7 +1,5 @@
 package korlibs.time
 
-import korlibs.math.*
-import korlibs.number.*
 import korlibs.time.internal.*
 import kotlin.jvm.*
 import kotlin.math.*

korge-foundation/src/korlibs/time/_Time.internal.kt → korlibs-time/src/korlibs/time/_Time.internal.kt

@@ -2,7 +2,6 @@
 
 package korlibs.time.internal
 
-import korlibs.math.*
 import korlibs.time.*
 import kotlin.jvm.*
 import kotlin.math.*
@@ -66,8 +65,8 @@ internal fun Double.padded(intCount: Int, decCount: Int): String {
 }
 
 internal fun String.substr(start: Int, length: Int = this.length): String {
-    val low = (if (start >= 0) start else this.length + start).clamp(0, this.length)
-    val high = (if (length >= 0) low + length else this.length + length).clamp(0, this.length)
+    val low = (if (start >= 0) start else this.length + start).coerceIn(0, this.length)
+    val high = (if (length >= 0) low + length else this.length + length).coerceIn(0, this.length)
     return if (high < low) "" else this.substring(low, high)
 }
 

korlibs-time/src/korlibs/time/internal/KlockInternal.kt

@@ -0,0 +1,29 @@
+package korlibs.time.internal
+
+import kotlin.math.*
+
+internal infix fun Int.umod(other: Int): Int {
+    val rm = this % other
+    val remainder = if (rm == -0) 0 else rm
+    return when {
+        remainder < 0 -> remainder + other
+        else -> remainder
+    }
+}
+internal infix fun Double.umod(other: Double): Double {
+    val rm = this % other
+    val remainder = if (rm == -0.0) 0.0 else rm
+    return when {
+        remainder < 0.0 -> remainder + other
+        else -> remainder
+    }
+}
+internal infix fun Int.div2(other: Int): Int = when {
+    this < 0 || this % other == 0 -> this / other
+    else -> (this / other) - 1
+}
+
+internal fun Int.cycle(min: Int, max: Int): Int = ((this - min) umod (max - min + 1)) + min
+internal fun Int.cycleSteps(min: Int, max: Int): Int = (this - min) / (max - min + 1)
+internal fun Double.toInt2(): Int = if (this < 0.0) floor(this).toInt() else this.toInt()
+internal fun Double.toIntMod(mod: Int): Int = (this umod mod.toDouble()).toInt2()

settings.gradle.kts

@@ -25,6 +25,7 @@ fun isPropertyTrue(name: String): Boolean {
 val inCI = isPropertyTrue("CI")
 val disabledExtraKorgeLibs = isPropertyTrue("DISABLED_EXTRA_KORGE_LIBS")
 
+include(":korlibs-time")
 include(":korge-foundation")
 include(":korge-core")
 include(":korge")