kscience/kmath
9
0
Fork 1
Code Issues Pull Requests 6 Packages Projects Releases 16 Wiki Activity

0.1.4-dev-4 #86

Merged
altavir merged 38 commits from dev into master 2020-04-30 11:36:59 +03:00
Conversation 0 Commits 38 Files Changed 72 +32 -13
2 changed files with 32 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit cbac4fca33 - Show all commits

31
examples/src/main/kotlin/scientifik/kmath/structures/VictorTest.kt
View File

@ -13,6 +13,12 @@ fun main() {
val viktorField = ViktorNDField(intArrayOf(dim, dim))
autoField.run {
var res = one
repeat(n/2) {
res += 1.0
}
}
measureAndPrint("Automatic field addition") {
autoField.run {
@ -23,6 +29,22 @@ fun main() {
}
}
viktorField.run {
var res = one
repeat(n/2) {
res += one
}
}
measureAndPrint("Viktor field addition") {
viktorField.run {
var res = one
repeat(n) {
res += one
}
}
}
measureAndPrint("Raw Viktor") {
val one = F64Array.full(init = 1.0, shape = *intArrayOf(dim, dim))
var res = one
@ -30,13 +52,4 @@ fun main() {
res = res + one
}
}
measureAndPrint("Viktor field addition") {
viktorField.run {
var res = one
repeat(n) {
res += 1.0
}
}
}
}

14
kmath-viktor/src/main/kotlin/scientifik/kmath/viktor/ViktorNDStructure.kt
View File

@ -65,9 +65,15 @@ class ViktorNDField(override val shape: IntArray) : NDField<Double, RealField, V
}
}.asStructure()
override fun ViktorNDStructure.plus(b: ViktorNDStructure): ViktorNDStructure =
(f64Buffer + b.f64Buffer).asStructure()
override fun add(a: ViktorNDStructure, b: ViktorNDStructure): ViktorNDStructure {
return (a.f64Buffer + b.f64Buffer).asStructure()
}
override fun ViktorNDStructure.minus(b: ViktorNDStructure): ViktorNDStructure =
(f64Buffer - b.f64Buffer).asStructure()
// override inline fun ViktorNDStructure.plus(b: ViktorNDStructure): ViktorNDStructure {
// return (f64Buffer + b.f64Buffer).asStructure()
// }
override fun multiply(a: ViktorNDStructure, k: Number): ViktorNDStructure {
return (a.f64Buffer * k.toDouble()).asStructure()
}
}