From b23ffe01869213ac26f8ed7a1eb446ca4453971b Mon Sep 17 00:00:00 2001 From: Filip Date: Thu, 23 Jan 2025 21:18:28 +0100 Subject: [PATCH] Rounding to 2 decimal places. --- src/main/kotlin/Main.kt | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/kotlin/Main.kt b/src/main/kotlin/Main.kt index 5b0ffeb..b553d84 100644 --- a/src/main/kotlin/Main.kt +++ b/src/main/kotlin/Main.kt @@ -3,6 +3,10 @@ package org.example import org.javacord.api.DiscordApiBuilder import org.javacord.api.event.message.MessageCreateEvent +fun Double.round(): String{ + return String.format("%.2f", this) +} + fun extractNumbers(pattern: String, text: String?): List { val matches = Regex(pattern).findAll(text ?: "") return matches @@ -15,14 +19,14 @@ fun extractNumbers(pattern: String, text: String?): List { fun convertKg(event: MessageCreateEvent) { for (kgs in extractNumbers("(\\d+[,.]*\\d*)\\s*kg", event.message.content)) { val pounds = kgs * 2.20462262 - event.channel.sendMessage("$kgs kg = $pounds lb") + event.channel.sendMessage("${kgs.round()} kg = ${pounds.round()} lb") } } fun convertLbs(event: MessageCreateEvent) { for (pounds in extractNumbers("(\\d+[,.]*\\d*)\\s*lb", event.message.content)) { val kgs = pounds / 2.20462262 - event.channel.sendMessage("$pounds lb = $kgs kg") + event.channel.sendMessage("${pounds.round()} lb = ${kgs.round()} kg") } } @@ -30,7 +34,7 @@ fun convertMph(event: MessageCreateEvent) { for (mph in extractNumbers("(\\d+[,.]*\\d*)\\s*mi*ph", event.message.content)) { val kmph = mph * 1.609344 val mps = kmph / 3.6 - event.channel.sendMessage("$mph mi/h = $kmph km/h = $mps m/s") + event.channel.sendMessage("${mph.round()} mi/h = ${kmph.round()} km/h = ${mps.round()} m/s") } } @@ -38,7 +42,7 @@ fun convertKmh(event: MessageCreateEvent) { for (kmph in extractNumbers("(\\d+[,.]*\\d*)\\s*km*[p\\/]h", event.message.content)) { val mph = kmph / 1.609344 val mps = kmph / 3.6 - event.channel.sendMessage("$kmph km/h = $mph mi/h = $mps m/s") + event.channel.sendMessage("${kmph.round()} km/h = ${mph.round()} mi/h = ${mps.round()} m/s") } }