Skip to content

Commit

Permalink
.
Browse files Browse the repository at this point in the history
  • Loading branch information
Quafadas committed Dec 8, 2024
1 parent e9df14a commit 995d5d2
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 5 deletions.
1 change: 1 addition & 0 deletions vecxt/jvm/src/arrays.scala
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ object arrays:
final val spil = spi.length()

extension (vec: Array[Boolean])
// Inefficient as it doesn't break if a false is found.
inline def all: Boolean =
var acc = ByteVector.broadcast(spb, 1.toByte)
var i = 0
Expand Down
8 changes: 4 additions & 4 deletions vecxt/test/src/helpers.forTests.scala
Original file line number Diff line number Diff line change
Expand Up @@ -24,31 +24,31 @@ inline def assertVecEquals(v1: NArray[Double], v2: NArray[Double])(implicit loc:
assert(v1.length == v2.length)
var i: Int = 0;
while i < v1.length do
munit.Assertions.assertEquals(v1(i), v2(i))
munit.Assertions.assertEquals(v1(i), v2(i), clue = s"at index $i")
i += 1
end while
end assertVecEquals

inline def assertVecEquals(v1: NArray[Int], v2: NArray[Int])(implicit loc: munit.Location): Unit =
var i: Int = 0;
while i < v1.length do
munit.Assertions.assertEquals(v1(i), v2(i))
munit.Assertions.assertEquals(v1(i), v2(i), clue = s"at index $i")
i += 1
end while
end assertVecEquals

inline def assertVecEquals(v1: NArray[Boolean], v2: NArray[Boolean])(implicit loc: munit.Location): Unit =
var i: Int = 0;
while i < v1.length do
munit.Assertions.assertEquals(v1(i), v2(i))
munit.Assertions.assertEquals(v1(i), v2(i), clue = s"at index $i")
i += 1
end while
end assertVecEquals

inline def assertVecEquals[A](v1: NArray[A], v2: NArray[A])(implicit loc: munit.Location): Unit =
var i: Int = 0;
while i < v1.length do
munit.Assertions.assertEquals(v1(i), v2(i))
munit.Assertions.assertEquals(v1(i), v2(i), clue = s"at index $i")
i += 1
end while
end assertVecEquals
12 changes: 11 additions & 1 deletion vecxt/test/src/intarray.test.scala
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,19 @@ class IntArrayExtensionSuite extends munit.FunSuite:
assertVecEquals(v3.increments, NArray(45, 2, 1, 3, 3, 2, -2))
}

test("<") {
test("logical comparisons") {
val check = v_fill < 5
assertVecEquals(check, NArray(true, true, true, true, true, false, false, false, false, false))

val checkGt = v_fill > 5
assertVecEquals(checkGt, NArray(false, false, false, false, false, false, true, true, true, true))

val checkGte = v_fill >= 5
assertVecEquals(checkGte, NArray(false, false, false, false, false, true, true, true, true, true))

val checkLte = v_fill <= 5
assertVecEquals(checkLte, NArray(true, true, true, true, true, true, false, false, false, false))

}

end IntArrayExtensionSuite

0 comments on commit 995d5d2

Please sign in to comment.