trace

Quafadas · Dec 25, 2024 · 92b8a7b · 92b8a7b
1 parent 0117903
commit 92b8a7b
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/vecxt/jvm/src/rpt.scala b/vecxt/jvm/src/rpt.scala
@@ -9,6 +9,7 @@ import vecxt.reinsurance.Retentions.*
   f(X;retention, limit) = MIN(MAX(X - retention, 0), limit))
 
   Note: mutates the input array
+  TODO: SIMD
  */
 object rpt:
   extension (vec: Array[Double])

diff --git a/vecxt/src/doublematrix.scala b/vecxt/src/doublematrix.scala
@@ -1,15 +1,11 @@
 package vecxt
 
 import vecxt.BoundsCheck.BoundsCheck
-import vecxt.JsDoubleMatrix.*
 import vecxt.JvmDoubleMatrix.*
-import vecxt.MatrixHelper.*
-import vecxt.MatrixInstance.*
-import vecxt.NativeDoubleMatrix.*
 import vecxt.arrays.*
 import vecxt.matrix.*
-import vecxt.rangeExtender.MatrixRange.RangeExtender
-import vecxt.rangeExtender.MatrixRange.range
+
+import vecxt.matrixUtil.diag
 
 object DoubleMatrix:
 
@@ -19,6 +15,12 @@ object DoubleMatrix:
 
     inline def *:*=(d: Double): Unit = m.raw.multInPlace(d)
 
+    inline def trace =
+      if m.shape(0) != m.shape(1) then throw new IllegalArgumentException("Matrix must be square")
+      end if
+      m.diag.sum
+    end trace
+
     // inline def >=(d: Double): Matrix[Boolean] =
     //   Matrix[Boolean](m.raw >= d, m.shape)(using BoundsCheck.DoBoundsCheck.no)
 

diff --git a/vecxt/test/src/matrix.test.scala b/vecxt/test/src/matrix.test.scala
@@ -276,6 +276,12 @@ class MatrixExtensionSuite extends FunSuite:
     assertEquals(mat.raw(1), 7.0)
   }
 
+  test("trace") {
+    val mat = Matrix[Double](NArray(1.0, 2.0, 3.0, 4.0), (2, 2))
+    println(mat.printMat)
+    assertEquals(mat.trace, 5.0)
+  }
+
   test("Matrix column extraction") {
     val array = NArray[Double](1.0, 2.0, 3.0, 4.0)
     val matrix = Matrix[Double](array, (2, 2))