Skip to content
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

Jump to bottom

Lots of new functions on NDArrays #78

Merged
merged 6 commits into from Oct 23, 2018
Merged

Lots of new functions on NDArrays #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
11e1a04
Added standard elementwise math functions on NDArrays
peastman Oct 18, 2018
8724a92
Implemented toString() for NDArray
peastman Oct 18, 2018
2e48193
sum() and mean() for NDArrays
peastman Oct 18, 2018
38311ca
min(), max(), argMin(), argMax(), and allClose() for NDArrays
peastman Oct 19, 2018
0efdef4
Reductions over one axis of an NDArray
peastman Oct 20, 2018
5ef0d97
Changes to API based on comments
peastman Oct 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
25 changes: 8 additions & 17 deletions build.gradle
View file
Open in desktop
Expand Up @@ -499,6 +499,7 @@ def genCode(project, namespace, dtypesMatrix, dtypesNDArray, dtypeSuffixMap) {
dtypeName: dtypeName(dtype),
genDec: genDec(dtype),
reifiedDec: reifiedDec(dtype),
comparableDec: comparableDec(dtype),
mapDec: mapDec(dtype),
toMatrix: toMatrix(dtype, dtypesMatrix),
operators: operators(dtype),
Expand Down Expand Up @@ -563,6 +564,10 @@ def reifiedDec(dtype) {
dtype == 'T' ? "<reified T>" : ""
}

def comparableDec(dtype) {
dtype == 'T' ? "<T: Comparable<T>>" : ""
}

def mapDec(dtype) {
dtype == 'T' ? "<T, reified R>" : "<reified R>"
}
Expand All @@ -586,8 +591,8 @@ def convertGetter(baseDtype, toDtype) {
if(baseDtype == 'T')
return " override fun get${toDtype}(i: Int): ${toDtype} {\n" +
" val ele = getGeneric(i)\n" +
" if (ele is ${toDtype})\n" +
" return ele\n" +
" if (ele is Number)\n" +
" return ele.to${toDtype}()\n" +
" else\n" +
" error(wrongType)\n" +
" }"
Expand Down Expand Up @@ -618,21 +623,7 @@ def floatersOnly(dtype) {
"operator fun Matrix<${dtype}>.set(i: Int, v: Int) = this.set${dtype}(i, v.to${dtype}())\n" +
"@KomaJvmName(\"set2D${dtype}FromInt\")\n" +
"@KomaJsName(\"set2D${dtype}FromInt\")\n" +
"operator fun Matrix<${dtype}>.set(i: Int, j: Int, v: Int) = this.set${dtype}(i, j, v.to${dtype}())\n" +
"\n" +
"@KomaJvmName(\"allClose${dtype}\")\n" +
"fun Matrix<${dtype}>.allClose(other: Matrix<${dtype}>, rtol:Double=1e-05, atol:Double=1e-08): Boolean {\n" +
" if(other.numRows() != numRows() || other.numCols() != numCols())\n" +
" return false\n" +
" for(row in 0 until this.numRows()) {\n" +
" for (col in 0 until this.numCols()) {\n" +
" val err = kotlin.math.abs(this[row, col] - other[row, col])\n" +
" if (err > atol + rtol * kotlin.math.abs(this[row, col]))\n" +
" return false\n" +
" }\n" +
" }\n" +
" return true\n" +
"}"
"operator fun Matrix<${dtype}>.set(i: Int, j: Int, v: Int) = this.set${dtype}(i, j, v.to${dtype}())\n"
}
else {
return ""
Expand Down