fix

Quafadas · Nov 20, 2024 · 5928b22 · 5928b22
1 parent 6951559
commit 5928b22
Show file tree

Hide file tree

Showing 23 changed files with 110 additions and 91 deletions.
diff --git a/vecxt/js-native/src/array.scala b/vecxt/js-native/src/array.scala
@@ -1,6 +1,6 @@
 package vecxt
 
-import narr.*
+import narr._
 import vecxt.matrix.Matrix
 
 // These use project panama (SIMD) on the JVM, so need own JS native implementation

diff --git a/vecxt/js/src/array.scala b/vecxt/js/src/array.scala
@@ -15,11 +15,12 @@
  */
 package vecxt
 
+import narr._
+import vecxt.BoundsCheck.BoundsCheck
+
 import scala.scalajs.js
 import scala.scalajs.js.typedarray.Float64Array
-import scala.util.chaining.*
-import narr.*
-import vecxt.BoundsCheck.BoundsCheck
+import scala.util.chaining._
 
 object arrayUtil:
   extension [A](d: Array[A]) def printArr: String = d.mkString("[", ",", "]")

diff --git a/vecxt/js/src/dimCheck.scala b/vecxt/js/src/dimCheck.scala
@@ -16,10 +16,11 @@
 
 package vecxt
 
+import narr._
+import vecxt.BoundsCheck.BoundsCheck
+
 import scala.scalajs.js
 import scala.scalajs.js.typedarray.Float64Array
-import vecxt.BoundsCheck.BoundsCheck
-import narr.*
 
 protected[vecxt] object dimCheckLen:
   inline def apply(a: Float64Array, b: Int)(using inline doCheck: BoundsCheck) =

diff --git a/vecxt/js/src/doublematrix.scala b/vecxt/js/src/doublematrix.scala
@@ -1,14 +1,16 @@
 package vecxt
 
-import narr.*
-import matrix.*
-import vecxt.MatrixHelper.*
-import vecxt.MatrixInstance.*
-import scala.scalajs.js.typedarray.Float64Array
+import narr._
 import vecxt.BoundsCheck.BoundsCheck
-import vecxt.arrays.*
-import vecxt.rangeExtender.MatrixRange.range
+import vecxt.MatrixHelper._
+import vecxt.MatrixInstance._
+import vecxt.arrays._
 import vecxt.rangeExtender.MatrixRange.RangeExtender
+import vecxt.rangeExtender.MatrixRange.range
+
+import scala.scalajs.js.typedarray.Float64Array
+
+import matrix._
 
 object JsDoubleMatrix:
 

diff --git a/vecxt/js/src/rpt.scala b/vecxt/js/src/rpt.scala
@@ -1,9 +1,11 @@
 package vecxt.reinsurance
 
+import vecxt.arrays._
+
+import scala.scalajs.js.typedarray.Float64Array
+
 import Limits.Limit
 import Retentions.Retention
-import vecxt.arrays.*
-import scala.scalajs.js.typedarray.Float64Array
 
 /*
 

diff --git a/vecxt/jvm-native/src/dimCheck.scala b/vecxt/jvm-native/src/dimCheck.scala
@@ -16,8 +16,8 @@
 
 package vecxt
 
-import vecxt.matrix.*
 import vecxt.BoundsCheck.BoundsCheck
+import vecxt.matrix._
 
 protected[vecxt] object dimCheckLen:
   inline def apply[A](a: Array[A], b: Int)(using inline doCheck: BoundsCheck) =

diff --git a/vecxt/jvm-native/src/doublematrix.scala b/vecxt/jvm-native/src/doublematrix.scala
@@ -1,12 +1,14 @@
 package vecxt
 
-import matrix.*
-import narr.*
+import narr._
 import vecxt.BoundsCheck.BoundsCheck
-import vecxt.arrays.*
+import vecxt.DoubleArrays._
+import vecxt.MatrixInstance._
+import vecxt.arrays._
+
 import scala.reflect.ClassTag
-import vecxt.MatrixInstance.*
-import vecxt.DoubleArrays.*
+
+import matrix._
 
 object JvmNativeDoubleMatrix:
   extension (m: Matrix[Double])

diff --git a/vecxt/jvm/src/arrays.scala b/vecxt/jvm/src/arrays.scala
@@ -15,17 +15,16 @@
  */
 package vecxt
 
-import dev.ludovic.netlib.blas.JavaBLAS.getInstance as blas
-import scala.util.chaining.*
-
-import jdk.incubator.vector.VectorMask
+import dev.ludovic.netlib.blas.JavaBLAS.{getInstance => blas}
 import jdk.incubator.vector.ByteVector
 import jdk.incubator.vector.DoubleVector
-import jdk.incubator.vector.VectorSpecies
+import jdk.incubator.vector.VectorMask
 import jdk.incubator.vector.VectorOperators
-
+import jdk.incubator.vector.VectorSpecies
 import vecxt.BoundsCheck.BoundsCheck
 
+import scala.util.chaining._
+
 object arrays:
 
   final val spd = DoubleVector.SPECIES_PREFERRED

diff --git a/vecxt/jvm/src/doublematrix.scala b/vecxt/jvm/src/doublematrix.scala
@@ -1,13 +1,15 @@
 package vecxt
 
-import matrix.*
-import narr.*
+import dev.ludovic.netlib.blas.JavaBLAS.{getInstance => blas}
+import narr._
 import vecxt.BoundsCheck.BoundsCheck
-import vecxt.arrays.*
-import dev.ludovic.netlib.blas.JavaBLAS.getInstance as blas
+import vecxt.DoubleArrays._
+import vecxt.MatrixInstance._
+import vecxt.arrays._
+
 import scala.reflect.ClassTag
-import vecxt.MatrixInstance.*
-import vecxt.DoubleArrays.*
+
+import matrix._
 
 object JvmDoubleMatrix:
   extension (m: Matrix[Double])

diff --git a/vecxt/jvm/src/rpt.scala b/vecxt/jvm/src/rpt.scala
@@ -1,9 +1,9 @@
 package vecxt.reinsurance
 
-import vecxt.reinsurance.*
-import vecxt.reinsurance.Limits.*
-import vecxt.reinsurance.Retentions.*
-import vecxt.arrays.*
+import vecxt.arrays._
+import vecxt.reinsurance.Limits._
+import vecxt.reinsurance.Retentions._
+import vecxt.reinsurance._
 
 /*
 

diff --git a/vecxt/native/src/array.scala b/vecxt/native/src/array.scala
@@ -15,14 +15,15 @@
  */
 package vecxt
 
-import org.ekrich.blas.unsafe.*
-import scala.scalanative.unsafe.*
-import scala.util.chaining.*
-import vecxt.dimCheck
+import org.ekrich.blas._
+import org.ekrich.blas.unsafe._
 import vecxt.BoundsCheck
-import vecxt.matrix.*
-import org.ekrich.blas.*
 import vecxt.BoundsCheck.BoundsCheck
+import vecxt.dimCheck
+import vecxt.matrix._
+
+import scala.scalanative.unsafe._
+import scala.util.chaining._
 
 object arrays:
 

diff --git a/vecxt/native/src/doublematrix.scala b/vecxt/native/src/doublematrix.scala
@@ -1,14 +1,15 @@
 package vecxt
 
-import narr.*
-import vecxt.arrays.*
-import vecxt.matrix.*
-import vecxt.BoundsCheck.BoundsCheck
+import narr._
 import org.ekrich.blas.unsafe.blas
 import org.ekrich.blas.unsafe.blasEnums
-import scala.scalanative.unsafe.*
-import vecxt.matrixUtil.*
-import vecxt.MatrixInstance.*
+import vecxt.BoundsCheck.BoundsCheck
+import vecxt.MatrixInstance._
+import vecxt.arrays._
+import vecxt.matrix._
+import vecxt.matrixUtil._
+
+import scala.scalanative.unsafe._
 // import vecxt.rangeExtender.MatrixRange.range
 
 object NativeDoubleMatrix:

diff --git a/vecxt/native/src/rpt.scala b/vecxt/native/src/rpt.scala
@@ -1,8 +1,9 @@
 package vecxt.reinsurance
 
+import vecxt.arrays
+
 import Limits.Limit
 import Retentions.Retention
-import vecxt.arrays
 
 /*
 

diff --git a/vecxt/src/MatrixHelper.scala b/vecxt/src/MatrixHelper.scala
@@ -1,11 +1,13 @@
 package vecxt
 
-import matrix.*
-import narr.*
+import narr._
 import vecxt.BoundsCheck.BoundsCheck
-import vecxt.arrays.*
+import vecxt.arrays._
+
+import scala.compiletime._
 import scala.reflect.ClassTag
-import scala.compiletime.*
+
+import matrix._
 
 object MatrixHelper:
   extension (m: Matrix.type)

diff --git a/vecxt/src/MatrixInstance.scala b/vecxt/src/MatrixInstance.scala
@@ -1,13 +1,15 @@
 package vecxt
 
-import matrix.*
-import narr.*
+import narr._
 import vecxt.BoundsCheck.BoundsCheck
-import vecxt.rangeExtender.*
-import vecxt.arrays.*
-import scala.reflect.ClassTag
+import vecxt.arrays._
+import vecxt.rangeExtender._
+
 import scala.annotation.targetName
-import scala.compiletime.*
+import scala.compiletime._
+import scala.reflect.ClassTag
+
+import matrix._
 
 object MatrixInstance:
   extension [A](m: Matrix[A])

diff --git a/vecxt/src/cosineSimilarity.scala b/vecxt/src/cosineSimilarity.scala
@@ -1,9 +1,9 @@
 package vecxt
 
-import vecxt.arrays.norm
-import vecxt.arrays.dot
 import narr.NArray
 import vecxt.BoundsCheck.BoundsCheck
+import vecxt.arrays.dot
+import vecxt.arrays.norm
 
 /** Compute the cosine similarity between two vectors
   *

diff --git a/vecxt/src/dimMatCheck.scala b/vecxt/src/dimMatCheck.scala
@@ -1,9 +1,9 @@
 package vecxt
 
-import vecxt.matrix.*
-import vecxt.MatrixInstance.*
-import narr.*
+import narr._
 import vecxt.BoundsCheck.BoundsCheck
+import vecxt.MatrixInstance._
+import vecxt.matrix._
 
 protected[vecxt] object dimMatCheck:
   inline def apply[A](a: Matrix[A], b: Matrix[A])(using inline doCheck: BoundsCheck) =

diff --git a/vecxt/src/doublearray.scala b/vecxt/src/doublearray.scala
@@ -1,8 +1,9 @@
 package vecxt
 
-import narr.*
-import arrays.*
-import vecxt.JsNativeDoubleArrays.*
+import narr._
+import vecxt.JsNativeDoubleArrays._
+
+import arrays._
 
 object DoubleArrays:
   extension (vec: NArray[Double])

diff --git a/vecxt/src/doublematrix.scala b/vecxt/src/doublematrix.scala
@@ -1,16 +1,17 @@
 package vecxt
 
-import narr.*
-import matrix.*
-import vecxt.MatrixHelper.*
-import vecxt.MatrixInstance.*
+import narr._
 import vecxt.BoundsCheck.BoundsCheck
-import vecxt.arrays.*
-import vecxt.rangeExtender.MatrixRange.range
+import vecxt.JsDoubleMatrix._
+import vecxt.JvmDoubleMatrix._
+import vecxt.MatrixHelper._
+import vecxt.MatrixInstance._
+import vecxt.NativeDoubleMatrix._
+import vecxt.arrays._
 import vecxt.rangeExtender.MatrixRange.RangeExtender
-import vecxt.JvmDoubleMatrix.*
-import vecxt.JsDoubleMatrix.*
-import vecxt.NativeDoubleMatrix.*
+import vecxt.rangeExtender.MatrixRange.range
+
+import matrix._
 
 object DoubleMatrix:
 

diff --git a/vecxt/src/matrix.scala b/vecxt/src/matrix.scala
@@ -1,15 +1,15 @@
 package vecxt
 
-import narr.*
 import jdk.incubator.vector.DoubleVector
+import narr._
 import vecxt.BoundsCheck
+import vecxt.BoundsCheck.BoundsCheck
+import vecxt.arrays._
 import vecxt.dimMatInstantiateCheck
+import vecxt.indexCheckMat
+import vecxt.rangeExtender._
 import vecxt.sameDimMatCheck
-import vecxt.rangeExtender.*
-import vecxt.arrays.*
 
-import vecxt.indexCheckMat
-import vecxt.BoundsCheck.BoundsCheck
 import scala.reflect.ClassTag
 
 object matrix:

diff --git a/vecxt/src/matrixutil.scala b/vecxt/src/matrixutil.scala
@@ -1,14 +1,15 @@
 package vecxt
 
-import narr.*
-import vecxt.matrix.*
-import vecxt.MatrixInstance.*
+import narr._
 import vecxt.BoundsCheck
-import vecxt.arrays.multInPlace
-import vecxt.matrix.*
 import vecxt.BoundsCheck.BoundsCheck
-import scala.reflect.ClassTag
+import vecxt.MatrixInstance._
 import vecxt.arrayUtil.printArr
+import vecxt.arrays.multInPlace
+import vecxt.matrix._
+import vecxt.matrix._
+
+import scala.reflect.ClassTag
 // import vecxt.arrayUtil.printArr
 object matrixUtil:
 

diff --git a/vecxt/src/rangeExtender.scala b/vecxt/src/rangeExtender.scala
@@ -1,6 +1,6 @@
 package vecxt.rangeExtender
 
-import narr.*
+import narr._
 
 export MatrixRange.*
 

diff --git a/vecxt/src/tvar.scala b/vecxt/src/tvar.scala
@@ -1,6 +1,6 @@
 package vecxt.reinsurance
 
-import narr.*
+import narr._
 // import narr.native.Extensions.sort
 
 extension [N <: Int](thisVector: NArray[Double])