Shorter implementations

Author: Dr. Brandon Wiley

Codex/src/main/java/org/operatorfoundation/codex/symbols/CallAny.kt

@@ -1,97 +1,32 @@
 package org.operatorfoundation.codex.symbols
 
 class CallAny : Symbol {
-    override fun size(): Int {
-        return 26 + 10 + 1
-    }
+    companion object {
+        private val charToValue = mapOf(
+            "A" to 0, "B" to 1, "C" to 2, "D" to 3, "E" to 4, "F" to 5,
+            "G" to 6, "H" to 7, "I" to 8, "J" to 9, "K" to 10, "L" to 11,
+            "M" to 12, "N" to 13, "O" to 14, "P" to 15, "Q" to 16, "R" to 17,
+            "S" to 18, "T" to 19, "U" to 20, "V" to 21, "W" to 22, "X" to 23,
+            "Y" to 24, "Z" to 25, "0" to 26, "1" to 27, "2" to 28, "3" to 29,
+            "4" to 30, "5" to 31, "6" to 32, "7" to 33, "8" to 34, "9" to 35,
+            " " to 36
+        )
 
-    override fun toString(): String {
-        return "CallAny"
+        private val valueToChar = charToValue.map { (k, v) -> v to k }.toMap()
     }
 
+    override fun size(): Int = 26 + 10 + 1
+
+    override fun toString(): String = "CallAny"
+
     override fun decode(encodedValue: ByteArray): Int {
-        return when (encodedValue.toString()) {
-            "A" -> 0
-            "B" -> 1
-            "C" -> 2
-            "D" -> 3
-            "E" -> 4
-            "F" -> 5
-            "G" -> 6
-            "H" -> 7
-            "I" -> 8
-            "J" -> 9
-            "K" -> 10
-            "L" -> 11
-            "M" -> 12
-            "N" -> 13
-            "O" -> 14
-            "P" -> 15
-            "Q" -> 16
-            "R" -> 17
-            "S" -> 18
-            "T" -> 19
-            "U" -> 20
-            "V" -> 21
-            "W" -> 22
-            "X" -> 23
-            "Y" -> 24
-            "Z" -> 25
-            "0" -> 26
-            "1" -> 27
-            "2" -> 28
-            "3" -> 29
-            "4" -> 30
-            "5" -> 31
-            "6" -> 32
-            "7" -> 33
-            "8" -> 34
-            "9" -> 35
-            " " -> 36
-            else -> throw IllegalArgumentException("CallAny, bad value: $encodedValue")
-        }
+        return charToValue[encodedValue.toString()]
+            ?: throw IllegalArgumentException("CallAny, bad value: $encodedValue")
     }
 
     override fun encode(numericValue: Int): ByteArray {
-        return when (numericValue) {
-            0 -> "A".toByteArray()
-            1 -> "B".toByteArray()
-            2 -> "C".toByteArray()
-            3 -> "D".toByteArray()
-            4 -> "E".toByteArray()
-            5 -> "F".toByteArray()
-            6 -> "G".toByteArray()
-            7 -> "H".toByteArray()
-            8 -> "I".toByteArray()
-            9 -> "J".toByteArray()
-            10 -> "K".toByteArray()
-            11 -> "L".toByteArray()
-            12 -> "M".toByteArray()
-            13 -> "N".toByteArray()
-            14 -> "O".toByteArray()
-            15 -> "P".toByteArray()
-            16 -> "Q".toByteArray()
-            17 -> "R".toByteArray()
-            18 -> "S".toByteArray()
-            19 -> "T".toByteArray()
-            20 -> "U".toByteArray()
-            21 -> "V".toByteArray()
-            22 -> "W".toByteArray()
-            23 -> "X".toByteArray()
-            24 -> "Y".toByteArray()
-            25 -> "Z".toByteArray()
-            26 -> "0".toByteArray()
-            27 -> "1".toByteArray()
-            28 -> "2".toByteArray()
-            29 -> "3".toByteArray()
-            30 -> "4".toByteArray()
-            31 -> "5".toByteArray()
-            32 -> "6".toByteArray()
-            33 -> "7".toByteArray()
-            34 -> "8".toByteArray()
-            35 -> "9".toByteArray()
-            36 -> " ".toByteArray()
-            else -> throw IllegalArgumentException("Unknown value $numericValue for CallAny")
-        }
+        return (valueToChar[numericValue]
+            ?: throw IllegalArgumentException("Unknown value $numericValue for CallAny"))
+            .toByteArray()
     }
 }

Codex/src/main/java/org/operatorfoundation/codex/symbols/CallLetter.kt

@@ -1,75 +1,30 @@
 package org.operatorfoundation.codex.symbols
 
 class CallLetter : Symbol {
-    override fun size(): Int {
-        return 26
-    }
+    companion object {
+        private val charToValue = mapOf(
+            "A" to 0, "B" to 1, "C" to 2, "D" to 3, "E" to 4, "F" to 5,
+            "G" to 6, "H" to 7, "I" to 8, "J" to 9, "K" to 10, "L" to 11,
+            "M" to 12, "N" to 13, "O" to 14, "P" to 15, "Q" to 16, "R" to 17,
+            "S" to 18, "T" to 19, "U" to 20, "V" to 21, "W" to 22, "X" to 23,
+            "Y" to 24, "Z" to 25
+        )
 
-    override fun toString(): String {
-        return "CallLetter"
+        private val valueToChar = charToValue.map { (k, v) -> v to k }.toMap()
     }
 
+    override fun size(): Int = 26
+
+    override fun toString(): String = "CallLetter"
+
     override fun decode(encodedValue: ByteArray): Int {
-        return when (encodedValue.toString()) {
-            "A" -> 0
-            "B" -> 1
-            "C" -> 2
-            "D" -> 3
-            "E" -> 4
-            "F" -> 5
-            "G" -> 6
-            "H" -> 7
-            "I" -> 8
-            "J" -> 9
-            "K" -> 10
-            "L" -> 11
-            "M" -> 12
-            "N" -> 13
-            "O" -> 14
-            "P" -> 15
-            "Q" -> 16
-            "R" -> 17
-            "S" -> 18
-            "T" -> 19
-            "U" -> 20
-            "V" -> 21
-            "W" -> 22
-            "X" -> 23
-            "Y" -> 24
-            "Z" -> 25
-            else -> throw IllegalArgumentException("CallLetter, bad value: $encodedValue")
-        }
+        return charToValue[encodedValue.toString()]
+            ?: throw IllegalArgumentException("CallLetter, bad value: $encodedValue")
     }
 
     override fun encode(numericValue: Int): ByteArray {
-        return when (numericValue) {
-            0 -> "A".toByteArray()
-            1 -> "B".toByteArray()
-            2 -> "C".toByteArray()
-            3 -> "D".toByteArray()
-            4 -> "E".toByteArray()
-            5 -> "F".toByteArray()
-            6 -> "G".toByteArray()
-            7 -> "H".toByteArray()
-            8 -> "I".toByteArray()
-            9 -> "J".toByteArray()
-            10 -> "K".toByteArray()
-            11 -> "L".toByteArray()
-            12 -> "M".toByteArray()
-            13 -> "N".toByteArray()
-            14 -> "O".toByteArray()
-            15 -> "P".toByteArray()
-            16 -> "Q".toByteArray()
-            17 -> "R".toByteArray()
-            18 -> "S".toByteArray()
-            19 -> "T".toByteArray()
-            20 -> "U".toByteArray()
-            21 -> "V".toByteArray()
-            22 -> "W".toByteArray()
-            23 -> "X".toByteArray()
-            24 -> "Y".toByteArray()
-            25 -> "Z".toByteArray()
-            else -> throw IllegalArgumentException("Unknown value $numericValue for CallLetter")
-        }
+        return (valueToChar[numericValue]
+            ?: throw IllegalArgumentException("Unknown value $numericValue for CallLetter"))
+            .toByteArray()
     }
 }