All tests pass!

Dr. Brandon Wiley · Dr. Brandon Wiley · commit 309bd998131a · 2025-11-23T22:47:26.000-06:00
diff --git a/Codex/src/main/java/org/operatorfoundation/codex/Symbol.kt b/Codex/src/main/java/org/operatorfoundation/codex/Symbol.kt
@@ -10,7 +10,7 @@ interface SymbolFactory<T: Symbol>
      * Returns the number of possible values this symbol can represent.
      * For example, Binary returns 2, Byte returns 256.
      */
-    fun size(): Int
+    fun size(): BigInteger
 }
 
 /**
diff --git a/Codex/src/main/java/org/operatorfoundation/codex/symbols/Binary.kt b/Codex/src/main/java/org/operatorfoundation/codex/symbols/Binary.kt
@@ -7,7 +7,7 @@ class Binary(val value: Int) : Symbol {
     companion object : SymbolFactory<Binary> {
         const val MAX = 1
 
-        override fun size(): Int = MAX + 1
+        override fun size(): BigInteger = (MAX + 1).toBigInteger()
 
         /**
          * Encodes a numeric value to its byte array representation.
diff --git a/Codex/src/main/java/org/operatorfoundation/codex/symbols/CallAny.kt b/Codex/src/main/java/org/operatorfoundation/codex/symbols/CallAny.kt
@@ -22,7 +22,7 @@ class CallAny(val value: Char) : Symbol {
         )
         private val valueToChar = charToValue.map { (k, v) -> v to k }.toMap()
 
-        override fun size(): Int = 37
+        override fun size(): BigInteger = 37.toBigInteger()
 
         override fun encode(numericValue: BigInteger): CallAny {
             val int = numericValue.toInt()
diff --git a/Codex/src/main/java/org/operatorfoundation/codex/symbols/CallLetter.kt b/Codex/src/main/java/org/operatorfoundation/codex/symbols/CallLetter.kt
@@ -18,7 +18,7 @@ class CallLetter(val value: Char) : Symbol {
         )
         private val valueToChar = charToValue.map { (k, v) -> v to k }.toMap()
 
-        override fun size(): Int = 26
+        override fun size(): BigInteger = 26.toBigInteger()
 
         override fun encode(numericValue: BigInteger): CallLetter {
             val int = numericValue.toInt()
diff --git a/Codex/src/main/java/org/operatorfoundation/codex/symbols/CallLetterNumber.kt b/Codex/src/main/java/org/operatorfoundation/codex/symbols/CallLetterNumber.kt
@@ -21,7 +21,7 @@ class CallLetterNumber(val value: Char) : Symbol {
         )
         private val valueToChar = charToValue.map { (k, v) -> v to k }.toMap()
 
-        override fun size(): Int = 36
+        override fun size(): BigInteger = 36.toBigInteger()
 
         override fun encode(numericValue: BigInteger): CallLetterNumber {
             val int = numericValue.toInt()
diff --git a/Codex/src/main/java/org/operatorfoundation/codex/symbols/CallLetterSpace.kt b/Codex/src/main/java/org/operatorfoundation/codex/symbols/CallLetterSpace.kt
@@ -19,7 +19,7 @@ class CallLetterSpace(val value: Char) : Symbol {
         )
         private val valueToChar = charToValue.map { (k, v) -> v to k }.toMap()
 
-        override fun size(): Int = 27
+        override fun size(): BigInteger = 27.toBigInteger()
 
         override fun encode(numericValue: BigInteger): CallLetterSpace {
             val int = numericValue.toInt()
diff --git a/Codex/src/main/java/org/operatorfoundation/codex/symbols/CallNumber.kt b/Codex/src/main/java/org/operatorfoundation/codex/symbols/CallNumber.kt
@@ -13,7 +13,7 @@ class CallNumber(val value: Char) : Symbol {
         )
         private val valueToChar = charToValue.map { (k, v) -> v to k }.toMap()
 
-        override fun size(): Int = 10
+        override fun size(): BigInteger = 10.toBigInteger()
 
         override fun encode(numericValue: BigInteger): CallNumber {
             val int = numericValue.toInt()
diff --git a/Codex/src/main/java/org/operatorfoundation/codex/symbols/GridLetter.kt b/Codex/src/main/java/org/operatorfoundation/codex/symbols/GridLetter.kt
@@ -15,7 +15,7 @@ class GridLetter(val value: Char) : Symbol {
         )
         private val valueToChar = charToValue.map { (k, v) -> v to k }.toMap()
         
-        override fun size(): Int = 18
+        override fun size(): BigInteger = 18.toBigInteger()
 
         override fun encode(numericValue: BigInteger): GridLetter {
             val int = numericValue.toInt()
diff --git a/Codex/src/main/java/org/operatorfoundation/codex/symbols/GridNumber.kt b/Codex/src/main/java/org/operatorfoundation/codex/symbols/GridNumber.kt
@@ -13,7 +13,7 @@ class GridNumber(val value: Char) : Symbol {
         )
         private val valueToChar = charToValue.map { (k, v) -> v to k }.toMap()
         
-        override fun size(): Int = 10
+        override fun size(): BigInteger = 10.toBigInteger()
 
         override fun encode(numericValue: BigInteger): GridNumber {
             val int = numericValue.toInt()
diff --git a/Codex/src/main/java/org/operatorfoundation/codex/symbols/Octet.kt b/Codex/src/main/java/org/operatorfoundation/codex/symbols/Octet.kt
@@ -7,7 +7,7 @@ class Octet(val value: Int) : Symbol {
     companion object : SymbolFactory<Octet> {
         const val MAX = 255
 
-        override fun size(): Int = MAX + 1
+        override fun size(): BigInteger = (MAX + 1).toBigInteger()
 
         /**
          * Encodes a numeric value to its byte array representation.
diff --git a/Codex/src/main/java/org/operatorfoundation/codex/symbols/Power.kt b/Codex/src/main/java/org/operatorfoundation/codex/symbols/Power.kt
@@ -13,7 +13,7 @@ class Power(val value: Int) : Symbol {
         )
         private val powerToIndex = indexToPower.map { (k, v) -> v to k }.toMap()
 
-        override fun size(): Int = 19
+        override fun size(): BigInteger = 19.toBigInteger()
 
         override fun encode(numericValue: BigInteger): Power {
             val powerValue = indexToPower[numericValue.toInt()]
diff --git a/Codex/src/main/java/org/operatorfoundation/codex/symbols/Required.kt b/Codex/src/main/java/org/operatorfoundation/codex/symbols/Required.kt
@@ -4,7 +4,7 @@ import org.operatorfoundation.codex.SymbolFactory
 import java.math.BigInteger
 
 class Required(val value: Char) : Symbol, SymbolFactory<Required> {
-    override fun size(): Int = 0
+    override fun size(): BigInteger = 0.toBigInteger()
 
     override fun toString(): String = "Required($value)"
 
diff --git a/Codex/src/main/java/org/operatorfoundation/codex/symbols/Trinary.kt b/Codex/src/main/java/org/operatorfoundation/codex/symbols/Trinary.kt
@@ -7,7 +7,7 @@ class Trinary(val value: Int) : Symbol {
     companion object : SymbolFactory<Trinary> {
         const val MAX = 2
 
-        override fun size(): Int = MAX + 1
+        override fun size(): BigInteger = (MAX + 1).toBigInteger()
 
         /**
          * Encodes a numeric value to its byte array representation.
diff --git a/Codex/src/main/java/org/operatorfoundation/codex/symbols/WSPRMessage.kt b/Codex/src/main/java/org/operatorfoundation/codex/symbols/WSPRMessage.kt
@@ -18,76 +18,86 @@ class WSPRMessage(
     val power: Power
 ) : Symbol {
     companion object : SymbolFactory<WSPRMessage> {
-        override fun size(): Int = (CallLetterNumber.size() * 6) + (GridLetter.size() * 2) + (GridNumber.size() * 2) + Power.size()
+        override fun size(): BigInteger {
+            val callsignCapacity = BigInteger.valueOf(CallLetterNumber.size().toLong()).pow(6)
+            val gridLetterCapacity = BigInteger.valueOf(GridLetter.size().toLong()).pow(2)
+            val gridNumberCapacity = BigInteger.valueOf(GridNumber.size().toLong()).pow(2)
+            val powerCapacity = Power.size()
+
+            return callsignCapacity
+                .multiply(gridLetterCapacity)
+                .multiply(gridNumberCapacity)
+                .multiply(powerCapacity)
+        }
 
         override fun encode(numericValue: BigInteger): WSPRMessage {
             var remaining = numericValue
 
             // power
             var size = Power.size()
-            var value = remaining.mod(size.toBigInteger())
+            var value = remaining.mod(size)
             val power = Power.encode(value)
-            remaining = remaining.divide(size.toBigInteger())
+            remaining = remaining.divide(size)
 
             // grid4
             size = GridNumber.size()
-            value = remaining.mod(size.toBigInteger())
+            value = remaining.mod(size)
             val grid4 = GridNumber.encode(value)
-            remaining = remaining.divide(size.toBigInteger())
+            remaining = remaining.divide(size)
 
             // grid3
             size = GridNumber.size()
-            value = remaining.mod(size.toBigInteger())
+            value = remaining.mod(size)
             val grid3 = GridNumber.encode(value)
-            remaining = remaining.divide(size.toBigInteger())
+            remaining = remaining.divide(size)
 
             // grid2
             size = GridLetter.size()
-            value = remaining.mod(size.toBigInteger())
+            value = remaining.mod(size)
             val grid2 = GridLetter.encode(value)
-            remaining = remaining.divide(size.toBigInteger())
+            remaining = remaining.divide(size)
 
             // grid1
             size = GridLetter.size()
-            value = remaining.mod(size.toBigInteger())
+            value = remaining.mod(size)
             val grid1 = GridLetter.encode(value)
-            remaining = remaining.divide(size.toBigInteger())
+            remaining = remaining.divide(size)
 
             // callsign6
             size = CallLetterNumber.size()
-            value = remaining.mod(size.toBigInteger())
+            value = remaining.mod(size)
             val callsign6 = CallLetterNumber.encode(value)
-            remaining = remaining.divide(size.toBigInteger())
+            remaining = remaining.divide(size)
 
             // callsign5
             size = CallLetterNumber.size()
-            value = remaining.mod(size.toBigInteger())
+            value = remaining.mod(size)
             val callsign5 = CallLetterNumber.encode(value)
-            remaining = remaining.divide(size.toBigInteger())
+            remaining = remaining.divide(size)
 
             // callsign4
             size = CallLetterNumber.size()
-            value = remaining.mod(size.toBigInteger())
+            value = remaining.mod(size)
             val callsign4 = CallLetterNumber.encode(value)
-            remaining = remaining.divide(size.toBigInteger())
+            remaining = remaining.divide(size)
 
             // callsign3
             size = CallLetterNumber.size()
-            value = remaining.mod(size.toBigInteger())
+            value = remaining.mod(size)
             val callsign3 = CallLetterNumber.encode(value)
-            remaining = remaining.divide(size.toBigInteger())
+            remaining = remaining.divide(size)
 
             // callsign2
             size = CallLetterNumber.size()
-            value = remaining.mod(size.toBigInteger())
+            value = remaining.mod(size)
             val callsign2 = CallLetterNumber.encode(value)
-            remaining = remaining.divide(size.toBigInteger())
+            remaining = remaining.divide(size)
 
             // callsign1
             size = CallLetterNumber.size()
-            value = remaining.mod(size.toBigInteger())
+            value = remaining.mod(size)
             val callsign1 = CallLetterNumber.encode(value)
-            remaining = remaining.divide(size.toBigInteger())
+            remaining = remaining.divide(size)
 
             require(remaining == BigInteger.ZERO) { "Value $numericValue is too large to encode in WSPR" }
 
@@ -107,47 +117,47 @@ class WSPRMessage(
         // Process symbols in order (most significant first in mixed-radix)
         var size = CallLetterNumber.size()
         var decoded = callsign1.decode()
-        result = result.multiply(size.toBigInteger()).add(decoded)
+        result = result.multiply(size).add(decoded)
 
         size = CallLetterNumber.size()
         decoded = callsign2.decode()
-        result = result.multiply(size.toBigInteger()).add(decoded)
+        result = result.multiply(size).add(decoded)
 
         size = CallLetterNumber.size()
         decoded = callsign3.decode()
-        result = result.multiply(size.toBigInteger()).add(decoded)
+        result = result.multiply(size).add(decoded)
 
         size = CallLetterNumber.size()
         decoded = callsign4.decode()
-        result = result.multiply(size.toBigInteger()).add(decoded)
+        result = result.multiply(size).add(decoded)
 
         size = CallLetterNumber.size()
         decoded = callsign5.decode()
-        result = result.multiply(size.toBigInteger()).add(decoded)
+        result = result.multiply(size).add(decoded)
 
         size = CallLetterNumber.size()
         decoded = callsign6.decode()
-        result = result.multiply(size.toBigInteger()).add(decoded)
+        result = result.multiply(size).add(decoded)
 
         size = GridLetter.size()
         decoded = grid1.decode()
-        result = result.multiply(size.toBigInteger()).add(decoded)
+        result = result.multiply(size).add(decoded)
 
         size = GridLetter.size()
         decoded = grid2.decode()
-        result = result.multiply(size.toBigInteger()).add(decoded)
+        result = result.multiply(size).add(decoded)
 
         size = GridNumber.size()
         decoded = grid3.decode()
-        result = result.multiply(size.toBigInteger()).add(decoded)
+        result = result.multiply(size).add(decoded)
 
         size = GridNumber.size()
         decoded = grid4.decode()
-        result = result.multiply(size.toBigInteger()).add(decoded)
+        result = result.multiply(size).add(decoded)
 
         size = Power.size()
         decoded = power.decode()
-        result = result.multiply(size.toBigInteger()).add(decoded)
+        result = result.multiply(size).add(decoded)
 
         return result
     }
diff --git a/Codex/src/main/java/org/operatorfoundation/codex/symbols/WSRPMessageSequence.kt b/Codex/src/main/java/org/operatorfoundation/codex/symbols/WSRPMessageSequence.kt
@@ -1,46 +1,21 @@
 package org.operatorfoundation.codex.symbols
 import java.math.BigInteger
 import org.operatorfoundation.codex.*
-import kotlin.reflect.full.companionObjectInstance
 
 /**
  * A sequence of WSPR messages that can encode arbitrarily large integers
  * by splitting them across multiple WSPR transmissions.
  */
 class WSPRMessageSequence(val messages: List<WSPRMessage>) : Symbol {
     companion object : SymbolFactory<WSPRMessageSequence> {
-        override fun size(): Int {
-            val callsign = CallLetterNumber::class.companionObjectInstance as? SymbolFactory<*>
-            if (callsign == null) {
-                return 0
-            }
-            val callSignSize = callsign.size()
-
-            val gridLetter = GridLetter::class.companionObjectInstance as? SymbolFactory<*>
-            if (gridLetter == null) {
-                return 0
-            }
-            val gridLetterSize = gridLetter.size()
-
-            val gridNumber = GridNumber::class.companionObjectInstance as? SymbolFactory<*>
-            if (gridNumber == null) {
-                return 0
-            }
-            val gridNumberSize = gridNumber.size()
-
-            val power = Power::class.companionObjectInstance as? SymbolFactory<*>
-            if (power == null) {
-                return 0
-            }
-            val powerSize = power.size()
-
-            return (callSignSize * 6) + (gridLetterSize * 2) + (gridNumberSize * 2) + powerSize
+        override fun size(): BigInteger {
+            throw UnsupportedOperationException("WSPRMessageSequence does not have a fixed size - it depends on the number of messages in the sequence")
         }
 
         override fun encode(numericValue: BigInteger): WSPRMessageSequence {
             val messages = mutableListOf<WSPRMessage>()
             var remaining = numericValue
-            val messageSize = size().toBigInteger()
+            val messageSize = WSPRMessage.size() // Use WSPRMessage.size(), NOT size()!
 
             do {
                 val value = remaining.mod(messageSize)
@@ -57,12 +32,14 @@ class WSPRMessageSequence(val messages: List<WSPRMessage>) : Symbol {
 
     override fun decode(): BigInteger {
         var result = BigInteger.ZERO
-        val messageSize = size().toBigInteger()
+        val messageSize = WSPRMessage.size() // Use WSPRMessage.size(), NOT size()!
 
+        // Process messages in order with positional values (least significant first)
+        var multiplier = BigInteger.ONE
         for(message in messages) {
-            // Process symbols in order (most significant first in mixed-radix)
             val decoded = message.decode()
-            result = result.multiply(messageSize).add(decoded)
+            result = result.add(decoded.multiply(multiplier))
+            multiplier = multiplier.multiply(messageSize)
         }
 
         return result
diff --git a/Codex/src/test/java/org/operatorfoundation/codex/EncoderDecoderTest.kt b/Codex/src/test/java/org/operatorfoundation/codex/EncoderDecoderTest.kt

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ interface SymbolFactory<T: Symbol>`
`10`	`10`	`* Returns the number of possible values this symbol can represent.`
`11`	`11`	`* For example, Binary returns 2, Byte returns 256.`
`12`	`12`	`*/`
`13`		`- fun size(): Int`
	`13`	`+ fun size(): BigInteger`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ class CallAny(val value: Char) : Symbol {`
`22`	`22`	`)`
`23`	`23`	`private val valueToChar = charToValue.map { (k, v) -> v to k }.toMap()`
`24`	`24`
`25`		`- override fun size(): Int = 37`
	`25`	`+ override fun size(): BigInteger = 37.toBigInteger()`
`26`	`26`
`27`	`27`	`override fun encode(numericValue: BigInteger): CallAny {`
`28`	`28`	`val int = numericValue.toInt()`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ class CallLetter(val value: Char) : Symbol {`
`18`	`18`	`)`
`19`	`19`	`private val valueToChar = charToValue.map { (k, v) -> v to k }.toMap()`
`20`	`20`
`21`		`- override fun size(): Int = 26`
	`21`	`+ override fun size(): BigInteger = 26.toBigInteger()`
`22`	`22`
`23`	`23`	`override fun encode(numericValue: BigInteger): CallLetter {`
`24`	`24`	`val int = numericValue.toInt()`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ class CallLetterNumber(val value: Char) : Symbol {`
`21`	`21`	`)`
`22`	`22`	`private val valueToChar = charToValue.map { (k, v) -> v to k }.toMap()`
`23`	`23`
`24`		`- override fun size(): Int = 36`
	`24`	`+ override fun size(): BigInteger = 36.toBigInteger()`
`25`	`25`
`26`	`26`	`override fun encode(numericValue: BigInteger): CallLetterNumber {`
`27`	`27`	`val int = numericValue.toInt()`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ class CallLetterSpace(val value: Char) : Symbol {`
`19`	`19`	`)`
`20`	`20`	`private val valueToChar = charToValue.map { (k, v) -> v to k }.toMap()`
`21`	`21`
`22`		`- override fun size(): Int = 27`
	`22`	`+ override fun size(): BigInteger = 27.toBigInteger()`
`23`	`23`
`24`	`24`	`override fun encode(numericValue: BigInteger): CallLetterSpace {`
`25`	`25`	`val int = numericValue.toInt()`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ class CallNumber(val value: Char) : Symbol {`
`13`	`13`	`)`
`14`	`14`	`private val valueToChar = charToValue.map { (k, v) -> v to k }.toMap()`
`15`	`15`
`16`		`- override fun size(): Int = 10`
	`16`	`+ override fun size(): BigInteger = 10.toBigInteger()`
`17`	`17`
`18`	`18`	`override fun encode(numericValue: BigInteger): CallNumber {`
`19`	`19`	`val int = numericValue.toInt()`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ class GridLetter(val value: Char) : Symbol {`
`15`	`15`	`)`
`16`	`16`	`private val valueToChar = charToValue.map { (k, v) -> v to k }.toMap()`
`17`	`17`
`18`		`- override fun size(): Int = 18`
	`18`	`+ override fun size(): BigInteger = 18.toBigInteger()`
`19`	`19`
`20`	`20`	`override fun encode(numericValue: BigInteger): GridLetter {`
`21`	`21`	`val int = numericValue.toInt()`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ class GridNumber(val value: Char) : Symbol {`
`13`	`13`	`)`
`14`	`14`	`private val valueToChar = charToValue.map { (k, v) -> v to k }.toMap()`
`15`	`15`
`16`		`- override fun size(): Int = 10`
	`16`	`+ override fun size(): BigInteger = 10.toBigInteger()`
`17`	`17`
`18`	`18`	`override fun encode(numericValue: BigInteger): GridNumber {`
`19`	`19`	`val int = numericValue.toInt()`