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

Update from dev #16

Merged
altavir merged 18 commits from dev into master 2018-10-12 11:18:55 +03:00
Conversation 0 Commits 18 Files Changed 32 +6 -3
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3576ddaf31 - Show all commits

7
kmath-common/src/main/kotlin/scientifik/kmath/operations/Algebra.kt
View File

@ -6,7 +6,7 @@ package scientifik.kmath.operations
* @param T the self type of the element * @param T the self type of the element
* @param S the type of mathematical context for this element * @param S the type of mathematical context for this element
*/ */
interface MathElement<T, S>{ interface MathElement<T, S> {
/** /**
* The context this element belongs to * The context this element belongs to
*/ */
@ -53,7 +53,7 @@ interface Space<T> {
* @param T self type of the element. Needed for static type checking * @param T self type of the element. Needed for static type checking
* @param S the type of space * @param S the type of space
*/ */
interface SpaceElement<T, S : Space<T>>: MathElement<T,S> { interface SpaceElement<T, S : Space<T>> : MathElement<T, S> {
/** /**
* Self value. Needed for static type checking. Needed to avoid type erasure on JVM. * Self value. Needed for static type checking. Needed to avoid type erasure on JVM.
@ -101,6 +101,9 @@ interface Field<T> : Ring<T> {
operator fun T.div(b: T): T = divide(this, b) operator fun T.div(b: T): T = divide(this, b)
operator fun Number.div(b: T) = this * divide(one, b) operator fun Number.div(b: T) = this * divide(one, b)
operator fun T.plus(b: Number) = this.plus(b * one)
operator fun Number.plus(b: T) = b + this
} }
/** /**

2
kmath-common/src/test/kotlin/scientifik/kmath/expressions/FieldExpressionContextTest.kt
View File

@ -10,7 +10,7 @@ class FieldExpressionContextTest {
val context = FieldExpressionContext(DoubleField) val context = FieldExpressionContext(DoubleField)
val expression = with(context) { val expression = with(context) {
val x = variable("x", 2.0) val x = variable("x", 2.0)
x * x + 2 * x + 1.0 * one x * x + 2 * x + 1.0
} }
assertEquals(expression("x" to 1.0), 4.0) assertEquals(expression("x" to 1.0), 4.0)
assertEquals(expression(), 9.0) assertEquals(expression(), 9.0)