Dev #127

Merged
altavir merged 214 commits from dev into master 2020-08-11 08:33:21 +03:00
4 changed files with 8 additions and 5 deletions
Showing only changes of commit 866ae47239 - Show all commits

View File

@ -43,7 +43,7 @@ sealed class MST {
fun <T> NumericAlgebra<T>.evaluate(node: MST): T {
return when (node) {
is MST.Numeric -> number(node.value)
is MST.Singular -> raw(node.value)
is MST.Singular -> symbol(node.value)
is MST.Unary -> unaryOperation(node.operation, evaluate(node.value))
is MST.Binary -> when {
node.left is MST.Numeric && node.right is MST.Numeric -> {

View File

@ -12,7 +12,7 @@ class MSTExpression<T>(val algebra: NumericAlgebra<T>, val mst: MST) : Expressio
* Substitute algebra raw value
*/
private inner class InnerAlgebra(val arguments: Map<String, T>) : NumericAlgebra<T> by algebra {
override fun raw(value: String): T = arguments[value] ?: super.raw(value)
override fun symbol(value: String): T = arguments[value] ?: super.symbol(value)
}
override fun invoke(arguments: Map<String, T>): T = InnerAlgebra(arguments).evaluate(mst)

View File

@ -10,7 +10,10 @@ interface Algebra<T> {
/**
* Wrap raw string or variable
*/
fun raw(value: String): T = error("Wrapping of '$value' is not supported in $this")
fun symbol(value: String): T = error("Wrapping of '$value' is not supported in $this")
@Deprecated("Symbol is more concise",replaceWith = ReplaceWith("symbol"))
fun raw(value: String): T = symbol(value)
/**
* Dynamic call of unary operation with name [operation] on [arg]

View File

@ -51,10 +51,10 @@ object ComplexField : ExtendedField<Complex> {
operator fun Double.times(c: Complex) = Complex(c.re * this, c.im * this)
override fun raw(value: String): Complex = if (value == "i") {
override fun symbol(value: String): Complex = if (value == "i") {
i
} else {
super.raw(value)
super.symbol(value)
}
}