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

Moved multivariate histogram to common

Browse Source
This commit is contained in:
Alexander Nozik 2018-10-28 16:56:06 +03:00
parent c8329eef8a
commit 34374e1006
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kmath-core/src/jvmMain/kotlin/scientifik/kmath/histogram/FastHistogram.kt → kmath-core/src/commonMain/kotlin/scientifik/kmath/histogram/FastHistogram.kt
View File

@ -12,7 +12,7 @@ class MultivariateBin(override val center: RealVector, val sizes: RealVector, va
} }
override fun contains(vector: RealVector): Boolean { override fun contains(vector: RealVector): Boolean {
assert(vector.size == center.size) if(vector.size != center.size) error("Dimension mismatch for input vector. Expected ${center.size}, but found ${vector.size}")
return vector.asSequence().mapIndexed { i, value -> value in (center[i] - sizes[i] / 2)..(center[i] + sizes[i] / 2) }.all { it } return vector.asSequence().mapIndexed { i, value -> value in (center[i] - sizes[i] / 2)..(center[i] + sizes[i] / 2) }.all { it }
} }

2
kmath-core/src/jvmTest/kotlin/scientifik/kmath/histogram/MultivariateHistogramTest.kt → kmath-core/src/commonTest/kotlin/scientifik/kmath/histogram/MultivariateHistogramTest.kt
View File

@ -1,8 +1,8 @@
package scientifik.kmath.histogram package scientifik.kmath.histogram
import org.junit.Test
import scientifik.kmath.linear.Vector import scientifik.kmath.linear.Vector
import kotlin.random.Random import kotlin.random.Random
import kotlin.test.Test
import kotlin.test.assertEquals import kotlin.test.assertEquals
import kotlin.test.assertFalse import kotlin.test.assertFalse
import kotlin.test.assertTrue import kotlin.test.assertTrue

10
kmath-core/src/jvmMain/kotlin/scientifik/kmath/histogram/UnivariateHistogram.kt
View File

@ -70,11 +70,10 @@ class UnivariateHistogram private constructor(private val factory: (Double) -> U
fun custom(borders: DoubleArray): UnivariateHistogram { fun custom(borders: DoubleArray): UnivariateHistogram {
val sorted = borders.sortedArray() val sorted = borders.sortedArray()
return UnivariateHistogram { value -> return UnivariateHistogram { value ->
if (value < sorted.first()) { when {
UnivariateBin(Double.NEGATIVE_INFINITY, Double.MAX_VALUE) value < sorted.first() -> UnivariateBin(Double.NEGATIVE_INFINITY, Double.MAX_VALUE)
} else if (value > sorted.last()) { value > sorted.last() -> UnivariateBin(Double.POSITIVE_INFINITY, Double.MAX_VALUE)
UnivariateBin(Double.POSITIVE_INFINITY, Double.MAX_VALUE) else -> {
} else {
val index = (0 until sorted.size).first { value > sorted[it] } val index = (0 until sorted.size).first { value > sorted[it] }
val left = sorted[index] val left = sorted[index]
val right = sorted[index + 1] val right = sorted[index + 1]
@ -83,6 +82,7 @@ class UnivariateHistogram private constructor(private val factory: (Double) -> U
} }
} }
} }
}
} }
fun UnivariateHistogram.fill(sequence: Iterable<Double>) = sequence.forEach { put(it) } fun UnivariateHistogram.fill(sequence: Iterable<Double>) = sequence.forEach { put(it) }