Followed up on code warnings and errors.

appliedtopology · Feb 21, 2024 · bf84601 · bf84601
1 parent 1db5e7e
commit bf84601
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/src/commonMain/kotlin/org/appliedtopology/tda4j/Chain.kt b/src/commonMain/kotlin/org/appliedtopology/tda4j/Chain.kt
@@ -50,7 +50,7 @@ public open class Chain<VertexT, CoefficientT> protected constructor(
 
         public operator fun <VertexT : Comparable<VertexT>, CoefficientT> invoke(
             chainMap: MutableMap<AbstractSimplex<VertexT>, CoefficientT>,
-        ) = Chain(naturalOrder(), SimplexComparator(), chainMap)
+        ): Chain<VertexT, CoefficientT> = Chain(naturalOrder(), SimplexComparator(), chainMap)
 
         public operator fun <VertexT, CoefficientT> invoke(
             vertexComparator: Comparator<VertexT>,
@@ -159,7 +159,7 @@ public class ChainContext<VertexT, CoefficientT> protected constructor(
 
             public operator fun <VertexT : Comparable<VertexT>, CoefficientT> invoke(
                 coefficientContext: FieldContext<CoefficientT>,
-            ): ChainContext<VertexT, CoefficientT> = ChainContext(kotlin.comparisons.naturalOrder<VertexT>(), coefficientContext)
+            ): ChainContext<VertexT, CoefficientT> = ChainContext(naturalOrder(), coefficientContext)
 
             public operator fun <VertexT : Comparable<VertexT>> invoke(): ChainContext<VertexT, Double> =
                 ChainContext(naturalOrder(), DoubleContext)

diff --git a/src/commonMain/kotlin/org/appliedtopology/tda4j/Field.kt b/src/commonMain/kotlin/org/appliedtopology/tda4j/Field.kt
@@ -24,6 +24,8 @@ public object DoubleContext : FieldContext<Double> {
     override val zero: Double
         get() = 0.0
 
+    override fun Double.unaryMinus(): Double = this@unaryMinus.unaryMinus()
+
     override fun multiply(
         left: Double,
         right: Double,

diff --git a/src/commonMain/kotlin/org/appliedtopology/tda4j/FiniteField.kt b/src/commonMain/kotlin/org/appliedtopology/tda4j/FiniteField.kt
@@ -37,9 +37,9 @@ public open class FiniteFieldContext(public val p: Int) : FieldContext<Fp>, FpFa
         var v = p
         var x1 = 1
         var x2 = 0
-        var q = 0
-        var r = 0
-        var x = 0
+        var q: Int
+        var r: Int
+        var x: Int
         while (u != 1) {
             q = v.floorDiv(u)
             r = v - q * u

diff --git a/src/commonTest/kotlin/org/appliedtopology/tda4j/ChainSpec.kt b/src/commonTest/kotlin/org/appliedtopology/tda4j/ChainSpec.kt
@@ -61,9 +61,9 @@ class ChainSpec : StringSpec({
             val singleQueryNull = chain1[simplexOf(3, 4)]
             // val severalQuery = chain1[listOf(simplexOf(2, 3), simplexOf(1, 2))]
 
-            singleQuery?.shouldBeEqual(1.0)
+            singleQuery.shouldBeEqual(1.0)
 
-            singleQueryNull?.shouldBeEqual(0.0)
+            singleQueryNull.shouldBeEqual(0.0)
 
             // severalQuery shouldBeEqual mapOf(simplexOf(2, 3) to 1, simplexOf(1, 2) to 2)
         }