From ca120259644496e3b3cd8885ffb8edca1608be1e Mon Sep 17 00:00:00 2001 From: "sailok.chinta" Date: Thu, 3 Oct 2024 12:26:46 +0530 Subject: [PATCH 1/5] feat: add conversion logic from integer to english --- .../conversions/IntegerToEnglish.java | 111 ++++++++++++++++++ .../conversions/IntegerToEnglishTest.java | 15 +++ 2 files changed, 126 insertions(+) create mode 100644 src/main/java/com/thealgorithms/conversions/IntegerToEnglish.java create mode 100644 src/test/java/com/thealgorithms/conversions/IntegerToEnglishTest.java diff --git a/src/main/java/com/thealgorithms/conversions/IntegerToEnglish.java b/src/main/java/com/thealgorithms/conversions/IntegerToEnglish.java new file mode 100644 index 000000000000..468b2dfad693 --- /dev/null +++ b/src/main/java/com/thealgorithms/conversions/IntegerToEnglish.java @@ -0,0 +1,111 @@ +package com.thealgorithms.conversions; + +import java.util.HashMap; + +public class IntegerToEnglish { + private static final HashMap baseNumbersMap = new HashMap<>() { + { + put(0, ""); + put(1, "One"); + put(2, "Two"); + put(3, "Three"); + put(4, "Four"); + put(5, "Five"); + put(6, "Six"); + put(7, "Seven"); + put(8, "Eight"); + put(9, "Nine"); + put(10, "Ten"); + put(11, "Eleven"); + put(12, "Twelve"); + put(13, "Thirteen"); + put(14, "Fourteen"); + put(15, "Fifteen"); + put(16, "Sixteen"); + put(17, "Seventeen"); + put(18, "Eighteen"); + put(19, "Nineteen"); + put(20, "Twenty"); + put(30, "Thirty"); + put(40, "Forty"); + put(50, "Fifty"); + put(60, "Sixty"); + put(70, "Seventy"); + put(80, "Eighty"); + put(90, "Ninety"); + put(100, "Hundred"); + } + }; + + private static final HashMap thousandPowerMap = new HashMap<>() { + { + put(1, "Thousand"); + put(2, "Million"); + put(3, "Billion"); + } + }; + + /** + converts numbers < 1000 to english words + */ + private static String convertToWords(int number) { + int remainder = number % 100; + + String result; + + if (remainder <= 20) { + result = baseNumbersMap.get(remainder); + } else if (baseNumbersMap.containsKey(remainder)) { + result = baseNumbersMap.get(remainder); + } else { + int tensDigit = remainder / 10; + int onesDigit = remainder % 10; + + result = String.format("%s %s", baseNumbersMap.get(tensDigit * 10), baseNumbersMap.get(onesDigit)); + } + + int hundredsDigit = number / 100; + + if (hundredsDigit > 0) { + result = String.format("%s %s%s", baseNumbersMap.get(hundredsDigit), baseNumbersMap.get(100), (result.isEmpty() ? "" : " " + result)); + } + + return result; + } + + /** + Only convert groups of three digit if they are non-zero + */ + public static String integerToEnglishWords(int number) { + if (number == 0) return "Zero"; + + StringBuilder result = new StringBuilder(); + + int index = 0; + + while (number > 0) { + int remainder = number % 1000; + number /= 1000; + + if (remainder > 0) { + String subResult = convertToWords(remainder); + + if (!subResult.isEmpty()) { + if (!result.isEmpty()) { + result.insert(0, subResult + " " + thousandPowerMap.get(index) + " "); + } else { + if (index > 0) { + result = new StringBuilder(subResult + " " + thousandPowerMap.get(index)); + } else { + result = new StringBuilder(subResult); + } + } + } + } + + index++; + } + + return result.toString(); + } +} diff --git a/src/test/java/com/thealgorithms/conversions/IntegerToEnglishTest.java b/src/test/java/com/thealgorithms/conversions/IntegerToEnglishTest.java new file mode 100644 index 000000000000..49c43402aeca --- /dev/null +++ b/src/test/java/com/thealgorithms/conversions/IntegerToEnglishTest.java @@ -0,0 +1,15 @@ +package com.thealgorithms.conversions; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.junit.jupiter.api.Test; + +public class IntegerToEnglishTest { + + @Test + public void testIntegerToEnglish() { + assertEquals("Two Billion One Hundred Forty Seven Million Four Hundred Eighty Three Thousand Six Hundred Forty Seven", IntegerToEnglish.integerToEnglishWords(2147483647)); + assertEquals("One Million Two Hundred Thirty Four Thousand Five Hundred Sixty Seven", IntegerToEnglish.integerToEnglishWords(1234567)); + assertEquals("Twelve Thousand Three Hundred Forty Five", IntegerToEnglish.integerToEnglishWords(12345)); + } +} From 270ad9ab064234d6cec6d6108e7fa537e015fcce Mon Sep 17 00:00:00 2001 From: "sailok.chinta" Date: Thu, 3 Oct 2024 12:29:11 +0530 Subject: [PATCH 2/5] feat: update DIRECTORY.md --- DIRECTORY.md | 1 + 1 file changed, 1 insertion(+) diff --git a/DIRECTORY.md b/DIRECTORY.md index 6f63a88b085a..8a198868da2a 100644 --- a/DIRECTORY.md +++ b/DIRECTORY.md @@ -67,6 +67,7 @@ * [HexaDecimalToBinary](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/conversions/HexaDecimalToBinary.java) * [HexaDecimalToDecimal](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/conversions/HexaDecimalToDecimal.java) * [HexToOct](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/conversions/HexToOct.java) + * [IntegerToEnglish] (https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/conversions/IntegerToEnglish.java) * [IntegerToRoman](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/conversions/IntegerToRoman.java) * [OctalToBinary](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/conversions/OctalToBinary.java) * [OctalToDecimal](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/conversions/OctalToDecimal.java) From 21042a4463d9edacf45d13589584c7671c024ceb Mon Sep 17 00:00:00 2001 From: "sailok.chinta" Date: Thu, 3 Oct 2024 12:33:47 +0530 Subject: [PATCH 3/5] feat: fix linting issues --- .../conversions/IntegerToEnglish.java | 27 +++++++++++-------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/thealgorithms/conversions/IntegerToEnglish.java b/src/main/java/com/thealgorithms/conversions/IntegerToEnglish.java index 468b2dfad693..86be916fd855 100644 --- a/src/main/java/com/thealgorithms/conversions/IntegerToEnglish.java +++ b/src/main/java/com/thealgorithms/conversions/IntegerToEnglish.java @@ -2,8 +2,8 @@ import java.util.HashMap; -public class IntegerToEnglish { - private static final HashMap baseNumbersMap = new HashMap<>() { +public final class IntegerToEnglish { + private static final HashMap BASE_NUMBERS_MAP = new HashMap<>() { { put(0, ""); put(1, "One"); @@ -37,7 +37,7 @@ public class IntegerToEnglish { } }; - private static final HashMap thousandPowerMap = new HashMap<>() { + private static final HashMap THOUSAND_POWER_MAP = new HashMap<>() { { put(1, "Thousand"); put(2, "Million"); @@ -45,6 +45,9 @@ public class IntegerToEnglish { } }; + private IntegerToEnglish() { + } + /** converts numbers < 1000 to english words */ @@ -54,20 +57,20 @@ private static String convertToWords(int number) { String result; if (remainder <= 20) { - result = baseNumbersMap.get(remainder); - } else if (baseNumbersMap.containsKey(remainder)) { - result = baseNumbersMap.get(remainder); + result = BASE_NUMBERS_MAP.get(remainder); + } else if (BASE_NUMBERS_MAP.containsKey(remainder)) { + result = BASE_NUMBERS_MAP.get(remainder); } else { int tensDigit = remainder / 10; int onesDigit = remainder % 10; - result = String.format("%s %s", baseNumbersMap.get(tensDigit * 10), baseNumbersMap.get(onesDigit)); + result = String.format("%s %s", BASE_NUMBERS_MAP.get(tensDigit * 10), BASE_NUMBERS_MAP.get(onesDigit)); } int hundredsDigit = number / 100; if (hundredsDigit > 0) { - result = String.format("%s %s%s", baseNumbersMap.get(hundredsDigit), baseNumbersMap.get(100), (result.isEmpty() ? "" : " " + result)); + result = String.format("%s %s%s", BASE_NUMBERS_MAP.get(hundredsDigit), BASE_NUMBERS_MAP.get(100), (result.isEmpty() ? "" : " " + result)); } return result; @@ -77,7 +80,9 @@ private static String convertToWords(int number) { Only convert groups of three digit if they are non-zero */ public static String integerToEnglishWords(int number) { - if (number == 0) return "Zero"; + if (number == 0) { + return "Zero"; + } StringBuilder result = new StringBuilder(); @@ -92,10 +97,10 @@ public static String integerToEnglishWords(int number) { if (!subResult.isEmpty()) { if (!result.isEmpty()) { - result.insert(0, subResult + " " + thousandPowerMap.get(index) + " "); + result.insert(0, subResult + " " + THOUSAND_POWER_MAP.get(index) + " "); } else { if (index > 0) { - result = new StringBuilder(subResult + " " + thousandPowerMap.get(index)); + result = new StringBuilder(subResult + " " + THOUSAND_POWER_MAP.get(index)); } else { result = new StringBuilder(subResult); } From b9a7eb1f2d38e42aa33dfd293d741edaede46d6f Mon Sep 17 00:00:00 2001 From: "sailok.chinta" Date: Thu, 3 Oct 2024 12:57:17 +0530 Subject: [PATCH 4/5] feat: fix build issue --- .../java/com/thealgorithms/conversions/IntegerToEnglish.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/thealgorithms/conversions/IntegerToEnglish.java b/src/main/java/com/thealgorithms/conversions/IntegerToEnglish.java index 86be916fd855..df8a8ce5a338 100644 --- a/src/main/java/com/thealgorithms/conversions/IntegerToEnglish.java +++ b/src/main/java/com/thealgorithms/conversions/IntegerToEnglish.java @@ -70,7 +70,7 @@ private static String convertToWords(int number) { int hundredsDigit = number / 100; if (hundredsDigit > 0) { - result = String.format("%s %s%s", BASE_NUMBERS_MAP.get(hundredsDigit), BASE_NUMBERS_MAP.get(100), (result.isEmpty() ? "" : " " + result)); + result = String.format("%s %s%s", BASE_NUMBERS_MAP.get(hundredsDigit), BASE_NUMBERS_MAP.get(100), result.isEmpty() ? "" : " " + result); } return result; From e792cbcfcb15613c4de642a718854418bc1d5df7 Mon Sep 17 00:00:00 2001 From: "sailok.chinta" Date: Fri, 4 Oct 2024 12:42:27 +0530 Subject: [PATCH 5/5] feat: address review comments --- .../conversions/IntegerToEnglish.java | 46 ++----------------- 1 file changed, 5 insertions(+), 41 deletions(-) diff --git a/src/main/java/com/thealgorithms/conversions/IntegerToEnglish.java b/src/main/java/com/thealgorithms/conversions/IntegerToEnglish.java index df8a8ce5a338..d3b938bf492d 100644 --- a/src/main/java/com/thealgorithms/conversions/IntegerToEnglish.java +++ b/src/main/java/com/thealgorithms/conversions/IntegerToEnglish.java @@ -1,49 +1,13 @@ package com.thealgorithms.conversions; -import java.util.HashMap; +import java.util.Map; public final class IntegerToEnglish { - private static final HashMap BASE_NUMBERS_MAP = new HashMap<>() { - { - put(0, ""); - put(1, "One"); - put(2, "Two"); - put(3, "Three"); - put(4, "Four"); - put(5, "Five"); - put(6, "Six"); - put(7, "Seven"); - put(8, "Eight"); - put(9, "Nine"); - put(10, "Ten"); - put(11, "Eleven"); - put(12, "Twelve"); - put(13, "Thirteen"); - put(14, "Fourteen"); - put(15, "Fifteen"); - put(16, "Sixteen"); - put(17, "Seventeen"); - put(18, "Eighteen"); - put(19, "Nineteen"); - put(20, "Twenty"); - put(30, "Thirty"); - put(40, "Forty"); - put(50, "Fifty"); - put(60, "Sixty"); - put(70, "Seventy"); - put(80, "Eighty"); - put(90, "Ninety"); - put(100, "Hundred"); - } - }; + private static final Map BASE_NUMBERS_MAP = Map.ofEntries(Map.entry(0, ""), Map.entry(1, "One"), Map.entry(2, "Two"), Map.entry(3, "Three"), Map.entry(4, "Four"), Map.entry(5, "Five"), Map.entry(6, "Six"), Map.entry(7, "Seven"), Map.entry(8, "Eight"), Map.entry(9, "Nine"), + Map.entry(10, "Ten"), Map.entry(11, "Eleven"), Map.entry(12, "Twelve"), Map.entry(13, "Thirteen"), Map.entry(14, "Fourteen"), Map.entry(15, "Fifteen"), Map.entry(16, "Sixteen"), Map.entry(17, "Seventeen"), Map.entry(18, "Eighteen"), Map.entry(19, "Nineteen"), Map.entry(20, "Twenty"), + Map.entry(30, "Thirty"), Map.entry(40, "Forty"), Map.entry(50, "Fifty"), Map.entry(60, "Sixty"), Map.entry(70, "Seventy"), Map.entry(80, "Eighty"), Map.entry(90, "Ninety"), Map.entry(100, "Hundred")); - private static final HashMap THOUSAND_POWER_MAP = new HashMap<>() { - { - put(1, "Thousand"); - put(2, "Million"); - put(3, "Billion"); - } - }; + private static final Map THOUSAND_POWER_MAP = Map.ofEntries(Map.entry(1, "Thousand"), Map.entry(2, "Million"), Map.entry(3, "Billion")); private IntegerToEnglish() { }