tidy range extender

Quafadas · Nov 18, 2024 · b7c40f2 · b7c40f2
1 parent 9a33975
commit b7c40f2
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 22 deletions.
diff --git a/todo.md b/todo.md
@@ -4,11 +4,13 @@
  - [x] reusable plot elements
   - [x] via named tuples and upickle?
   - [x] unit testing
+- [ ] Switch to named tuples for the Matrix type
+- [ ] Make matrix high dimensional
+ - [ ] Test with spire
 - [ ] Beautiful display in scala JS through MathMl
  - [ ] PR to scala JS dom in progress
  - [ ] PR to scalal DOM types
  - [ ] PR to laminar
 - [ ] Investiagte the feasibility of WASM?
-- [ ] Make matrix high dimensional
- - [ ] Test with spire
+
 - [ ] xPlatform LAPACK facade
diff --git a/vecxt/js/src/matrix.scala b/vecxt/js/src/matrix.scala
@@ -4,6 +4,8 @@ import narr.*
 import scala.scalajs.js.typedarray.Float64Array
 import vecxt.BoundsCheck.BoundsCheck
 import vecxt.arrays.*
+import vecxt.rangeExtender.MatrixRange.range
+import vecxt.rangeExtender.MatrixRange.RangeExtender
 
 object matrix:
 
@@ -31,8 +33,6 @@ object matrix:
     */
   opaque type Matrix = (NArray[Double], Tuple2[Int, Int])
 
-  type RangeExtender = Range | Int | NArray[Int] | ::.type
-
   // type Matrix = Matrix1 & Tensor
 
   object Matrix:
@@ -135,12 +135,6 @@ object matrix:
       m._1(idx) = value
     end update
 
-    private inline def range(r: RangeExtender, max: Int): NArray[Int] = r match
-      case _: ::.type     => NArray.from((0 until max).toArray)
-      case r: Range       => NArray.from(r.toArray)
-      case l: NArray[Int] => l
-      case i: Int         => NArray(i)
-
     def apply(rowRange: RangeExtender, colRange: RangeExtender): Matrix =
       val newRows = range(rowRange, m.rows)
       val newCols = range(colRange, m.cols)

diff --git a/vecxt/native/src/matrix.scala b/vecxt/native/src/matrix.scala
@@ -7,6 +7,7 @@ import org.ekrich.blas.unsafe.blas
 import org.ekrich.blas.unsafe.blasEnums
 import scala.scalanative.unsafe.*
 import vecxt.matrixUtil.*
+import vecxt.rangeExtender.MatrixRange.range
 
 object matrix:
   /** This is a matrix
@@ -119,12 +120,6 @@ object matrix:
       m._1(idx) = value
     end update
 
-    private inline def range(r: RangeExtender, max: Int): NArray[Int] = r match
-      case _: ::.type     => NArray.from((0 until max).toArray)
-      case r: Range       => NArray.from(r.toArray)
-      case l: NArray[Int] => l
-      case i: Int         => NArray(i)
-
     def apply(rowRange: RangeExtender, colRange: RangeExtender): Matrix =
       val newRows = range(rowRange, m.rows)
       val newCols = range(colRange, m.cols)

diff --git a/vecxt/src/rangeExtender.scala b/vecxt/src/rangeExtender.scala
@@ -2,13 +2,18 @@ package vecxt.rangeExtender
 
 import narr.*
 
-type RangeExtender = Range | Int | NArray[Int] | ::.type
+export MatrixRange.*
 
-inline def range(r: RangeExtender, max: Int): NArray[Int] = r match
-  case _: ::.type     => NArray.from((0 until max).toArray)
-  case r: Range       => NArray.from(r.toArray)
-  case l: NArray[Int] => l
-  case i: Int         => NArray(i)
+object MatrixRange:
+
+  type RangeExtender = Range | Int | NArray[Int] | ::.type
+
+  inline def range(r: RangeExtender, max: Int): NArray[Int] = r match
+    case _: ::.type     => NArray.from((0 until max).toArray)
+    case r: Range       => NArray.from(r.toArray)
+    case l: NArray[Int] => l
+    case i: Int         => NArray(i)
+end MatrixRange
 
 // import narr.*