Skip to content

Fix Matrix.fromColumns column/row indexing and add regression tests #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Ezrnest wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix Matrix.fromColumns column/row indexing and add regression tests #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/kotlin/io/github/ezrnest/mathsymk/linear/Matrix.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ interface Matrix<T> : GenTuple<T> {
val row = columns.first().size
val column = columns.size
require(columns.all { it.size == row })
return Matrix(row, column) { i, j -> columns[i][j] }
return Matrix(row, column) { i, j -> columns[j][i] }
}

/**
Expand Down Expand Up @@ -1564,4 +1564,4 @@ internal class MatOverFieldImpl<T>(override val model: Field<T>, row: Int, colum
// require(ps.all { it in this })
// return MatrixImpl.product(ps, model)
// }
//}
//}
32 changes: 32 additions & 0 deletions src/test/kotlin/linear/MatrixTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,38 @@ import kotlin.test.assertEquals
import kotlin.test.assertTrue

class MatrixTest {

@Test
fun fromColumnsKeepsColumnMajorPlacement() {
val columns = List(3) { col ->
Vector(3) { row -> 10 * col + row }
}
val matrix = Matrix.fromColumns(columns)

for (row in 0 until matrix.row) {
for (col in 0 until matrix.column) {
assertEquals(columns[col][row], matrix[row, col])
}
}
}

@Test
fun fromColumnsKeepsColumnMajorPlacementForRectangularMatrix() {
val columns = List(3) { col ->
Vector(2) { row -> 10 * col + row }
}
val matrix = Matrix.fromColumns(columns)

assertEquals(2, matrix.row)
assertEquals(3, matrix.column)
for (row in 0 until matrix.row) {
for (col in 0 until matrix.column) {
assertEquals(columns[col][row], matrix[row, col])
}
}
}


val Z = Models.ints()
val Zmod7 = Models.intModP(7)
val Zmod97 = Models.intModP(97)
Expand Down