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

Dev #127

Merged
altavir merged 214 commits from dev into master 2020-08-11 08:33:21 +03:00
Conversation 0 Commits 214 Files Changed 149 +4 -1
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 09641a5c9c - Show all commits

2
kmath-ast/src/commonMain/kotlin/scientifik/kmath/ast/MSTExpression.kt
View File

@ -4,7 +4,7 @@ import scientifik.kmath.expressions.Expression
import scientifik.kmath.operations.NumericAlgebra import scientifik.kmath.operations.NumericAlgebra
/** /**
* The expression evaluates MST on-flight * The expression evaluates MST on-flight. Should be much faster than functional expression, but slower than ASM-generated expressions.
*/ */
class MSTExpression<T>(val algebra: NumericAlgebra<T>, val mst: MST) : Expression<T> { class MSTExpression<T>(val algebra: NumericAlgebra<T>, val mst: MST) : Expression<T> {

3
kmath-ast/src/jvmMain/kotlin/scientifik/kmath/ast/parser.kt
View File

@ -12,6 +12,9 @@ import scientifik.kmath.operations.PowerOperations
import scientifik.kmath.operations.RingOperations import scientifik.kmath.operations.RingOperations
import scientifik.kmath.operations.SpaceOperations import scientifik.kmath.operations.SpaceOperations
/**
* TODO move to common
*/
private object ArithmeticsEvaluator : Grammar<MST>() { private object ArithmeticsEvaluator : Grammar<MST>() {
val num by token("-?[\\d.]+(?:[eE]-?\\d+)?") val num by token("-?[\\d.]+(?:[eE]-?\\d+)?")
val lpar by token("\\(") val lpar by token("\\(")