mirror of
https://github.com/DanilaFe/abacus
synced 2024-12-22 07:20:09 -08:00
Merge branch 'master' into definition-files
This commit is contained in:
commit
af988a34d1
|
@ -1,6 +1,8 @@
|
||||||
package org.nwapw.abacus.plugin.standard;
|
package org.nwapw.abacus.plugin.standard;
|
||||||
|
|
||||||
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.nwapw.abacus.context.MutableEvaluationContext;
|
import org.nwapw.abacus.context.MutableEvaluationContext;
|
||||||
|
import org.nwapw.abacus.context.PluginEvaluationContext;
|
||||||
import org.nwapw.abacus.function.Documentation;
|
import org.nwapw.abacus.function.Documentation;
|
||||||
import org.nwapw.abacus.function.DocumentationType;
|
import org.nwapw.abacus.function.DocumentationType;
|
||||||
import org.nwapw.abacus.function.interfaces.NumberFunction;
|
import org.nwapw.abacus.function.interfaces.NumberFunction;
|
||||||
|
@ -119,12 +121,12 @@ public class StandardPlugin extends Plugin {
|
||||||
*/
|
*/
|
||||||
public static final NumberFunction FUNCTION_ABS = new NumberFunction() {
|
public static final NumberFunction FUNCTION_ABS = new NumberFunction() {
|
||||||
@Override
|
@Override
|
||||||
public boolean matchesParams(MutableEvaluationContext context, NumberInterface[] params) {
|
public boolean matchesParams(PluginEvaluationContext context, NumberInterface[] params) {
|
||||||
return params.length == 1;
|
return params.length == 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public NumberInterface applyInternal(MutableEvaluationContext context, NumberInterface[] params) {
|
public NumberInterface applyInternal(PluginEvaluationContext context, NumberInterface[] params) {
|
||||||
return params[0].multiply(context.getInheritedNumberImplementation().instanceForString(Integer.toString(params[0].signum())));
|
return params[0].multiply(context.getInheritedNumberImplementation().instanceForString(Integer.toString(params[0].signum())));
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -133,12 +135,12 @@ public class StandardPlugin extends Plugin {
|
||||||
*/
|
*/
|
||||||
public static final NumberFunction FUNCTION_LN = new NumberFunction() {
|
public static final NumberFunction FUNCTION_LN = new NumberFunction() {
|
||||||
@Override
|
@Override
|
||||||
public boolean matchesParams(MutableEvaluationContext context, NumberInterface[] params) {
|
public boolean matchesParams(PluginEvaluationContext context, NumberInterface[] params) {
|
||||||
return params.length == 1 && params[0].compareTo(context.getInheritedNumberImplementation().instanceForString("0")) > 0;
|
return params.length == 1 && params[0].compareTo(context.getInheritedNumberImplementation().instanceForString("0")) > 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public NumberInterface applyInternal(MutableEvaluationContext context, NumberInterface[] params) {
|
public NumberInterface applyInternal(PluginEvaluationContext context, NumberInterface[] params) {
|
||||||
NumberImplementation implementation = context.getInheritedNumberImplementation();
|
NumberImplementation implementation = context.getInheritedNumberImplementation();
|
||||||
NumberInterface param = params[0];
|
NumberInterface param = params[0];
|
||||||
NumberInterface one = implementation.instanceForString("1");
|
NumberInterface one = implementation.instanceForString("1");
|
||||||
|
@ -166,10 +168,12 @@ public class StandardPlugin extends Plugin {
|
||||||
/**
|
/**
|
||||||
* Returns the partial sum of the Taylor series for logx (around x=1).
|
* Returns the partial sum of the Taylor series for logx (around x=1).
|
||||||
* Automatically determines the number of terms needed based on the precision of x.
|
* Automatically determines the number of terms needed based on the precision of x.
|
||||||
|
*
|
||||||
|
* @param context
|
||||||
* @param x value at which the series is evaluated. 0 < x < 2. (x=2 is convergent but impractical.)
|
* @param x value at which the series is evaluated. 0 < x < 2. (x=2 is convergent but impractical.)
|
||||||
* @return the partial sum.
|
* @return the partial sum.
|
||||||
*/
|
*/
|
||||||
private NumberInterface getLogPartialSum(MutableEvaluationContext context, NumberInterface x) {
|
private NumberInterface getLogPartialSum(PluginEvaluationContext context, NumberInterface x) {
|
||||||
NumberImplementation implementation = context.getInheritedNumberImplementation();
|
NumberImplementation implementation = context.getInheritedNumberImplementation();
|
||||||
NumberInterface maxError = x.getMaxError();
|
NumberInterface maxError = x.getMaxError();
|
||||||
x = x.subtract(implementation.instanceForString("1")); //Terms used are for log(x+1).
|
x = x.subtract(implementation.instanceForString("1")); //Terms used are for log(x+1).
|
||||||
|
@ -214,12 +218,12 @@ public class StandardPlugin extends Plugin {
|
||||||
*/
|
*/
|
||||||
public static final NumberFunction FUNCTION_RAND_INT = new NumberFunction() {
|
public static final NumberFunction FUNCTION_RAND_INT = new NumberFunction() {
|
||||||
@Override
|
@Override
|
||||||
public boolean matchesParams(MutableEvaluationContext context, NumberInterface[] params) {
|
public boolean matchesParams(PluginEvaluationContext context, NumberInterface[] params) {
|
||||||
return params.length == 1;
|
return params.length == 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public NumberInterface applyInternal(MutableEvaluationContext context, NumberInterface[] params) {
|
public NumberInterface applyInternal(PluginEvaluationContext context, NumberInterface[] params) {
|
||||||
return context.getInheritedNumberImplementation().instanceForString(Long.toString(Math.round(Math.random() * params[0].floor().intValue())));
|
return context.getInheritedNumberImplementation().instanceForString(Long.toString(Math.round(Math.random() * params[0].floor().intValue())));
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -232,12 +236,12 @@ public class StandardPlugin extends Plugin {
|
||||||
*/
|
*/
|
||||||
public static final NumberFunction FUNCTION_SQRT = new NumberFunction() {
|
public static final NumberFunction FUNCTION_SQRT = new NumberFunction() {
|
||||||
@Override
|
@Override
|
||||||
public boolean matchesParams(MutableEvaluationContext context, NumberInterface[] params) {
|
public boolean matchesParams(PluginEvaluationContext context, NumberInterface[] params) {
|
||||||
return params.length == 1;
|
return params.length == 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public NumberInterface applyInternal(MutableEvaluationContext context, NumberInterface[] params) {
|
public NumberInterface applyInternal(PluginEvaluationContext context, NumberInterface[] params) {
|
||||||
return OP_CARET.apply(context, params[0], context.getInheritedNumberImplementation().instanceForString(".5"));
|
return OP_CARET.apply(context, params[0], context.getInheritedNumberImplementation().instanceForString(".5"));
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -247,12 +251,12 @@ public class StandardPlugin extends Plugin {
|
||||||
*/
|
*/
|
||||||
public static final NumberFunction FUNCTION_EXP = new NumberFunction() {
|
public static final NumberFunction FUNCTION_EXP = new NumberFunction() {
|
||||||
@Override
|
@Override
|
||||||
public boolean matchesParams(MutableEvaluationContext context, NumberInterface[] params) {
|
public boolean matchesParams(PluginEvaluationContext context, NumberInterface[] params) {
|
||||||
return params.length == 1;
|
return params.length == 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public NumberInterface applyInternal(MutableEvaluationContext context, NumberInterface[] params) {
|
public NumberInterface applyInternal(PluginEvaluationContext context, NumberInterface[] params) {
|
||||||
NumberImplementation implementation = context.getInheritedNumberImplementation();
|
NumberImplementation implementation = context.getInheritedNumberImplementation();
|
||||||
NumberInterface maxError = params[0].getMaxError();
|
NumberInterface maxError = params[0].getMaxError();
|
||||||
int n = 0;
|
int n = 0;
|
||||||
|
@ -285,12 +289,12 @@ public class StandardPlugin extends Plugin {
|
||||||
*/
|
*/
|
||||||
public final NumberFunction functionSin = new NumberFunction() {
|
public final NumberFunction functionSin = new NumberFunction() {
|
||||||
@Override
|
@Override
|
||||||
public boolean matchesParams(MutableEvaluationContext context, NumberInterface[] params) {
|
public boolean matchesParams(PluginEvaluationContext context, NumberInterface[] params) {
|
||||||
return params.length == 1;
|
return params.length == 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public NumberInterface applyInternal(MutableEvaluationContext context, NumberInterface[] params) {
|
public NumberInterface applyInternal(PluginEvaluationContext context, NumberInterface[] params) {
|
||||||
NumberImplementation implementation = context.getInheritedNumberImplementation();
|
NumberImplementation implementation = context.getInheritedNumberImplementation();
|
||||||
NumberInterface pi = piFor(params[0].getClass());
|
NumberInterface pi = piFor(params[0].getClass());
|
||||||
NumberInterface twoPi = pi.multiply(implementation.instanceForString("2"));
|
NumberInterface twoPi = pi.multiply(implementation.instanceForString("2"));
|
||||||
|
@ -310,12 +314,12 @@ public class StandardPlugin extends Plugin {
|
||||||
*/
|
*/
|
||||||
public final NumberFunction functionCos = new NumberFunction() {
|
public final NumberFunction functionCos = new NumberFunction() {
|
||||||
@Override
|
@Override
|
||||||
public boolean matchesParams(MutableEvaluationContext context, NumberInterface[] params) {
|
public boolean matchesParams(PluginEvaluationContext context, NumberInterface[] params) {
|
||||||
return params.length == 1;
|
return params.length == 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public NumberInterface applyInternal(MutableEvaluationContext context, NumberInterface[] params) {
|
public NumberInterface applyInternal(PluginEvaluationContext context, NumberInterface[] params) {
|
||||||
return functionSin.apply(context, piFor(params[0].getClass()).divide(context.getInheritedNumberImplementation().instanceForString("2"))
|
return functionSin.apply(context, piFor(params[0].getClass()).divide(context.getInheritedNumberImplementation().instanceForString("2"))
|
||||||
.subtract(params[0]));
|
.subtract(params[0]));
|
||||||
}
|
}
|
||||||
|
@ -325,12 +329,12 @@ public class StandardPlugin extends Plugin {
|
||||||
*/
|
*/
|
||||||
public final NumberFunction functionTan = new NumberFunction() {
|
public final NumberFunction functionTan = new NumberFunction() {
|
||||||
@Override
|
@Override
|
||||||
public boolean matchesParams(MutableEvaluationContext context, NumberInterface[] params) {
|
public boolean matchesParams(PluginEvaluationContext context, NumberInterface[] params) {
|
||||||
return params.length == 1;
|
return params.length == 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public NumberInterface applyInternal(MutableEvaluationContext context, NumberInterface[] params) {
|
public NumberInterface applyInternal(PluginEvaluationContext context, NumberInterface[] params) {
|
||||||
return functionSin.apply(context, params[0]).divide(functionCos.apply(context, params[0]));
|
return functionSin.apply(context, params[0]).divide(functionCos.apply(context, params[0]));
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -339,12 +343,12 @@ public class StandardPlugin extends Plugin {
|
||||||
*/
|
*/
|
||||||
public final NumberFunction functionSec = new NumberFunction() {
|
public final NumberFunction functionSec = new NumberFunction() {
|
||||||
@Override
|
@Override
|
||||||
public boolean matchesParams(MutableEvaluationContext context, NumberInterface[] params) {
|
public boolean matchesParams(PluginEvaluationContext context, NumberInterface[] params) {
|
||||||
return params.length == 1;
|
return params.length == 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public NumberInterface applyInternal(MutableEvaluationContext context, NumberInterface[] params) {
|
public NumberInterface applyInternal(PluginEvaluationContext context, NumberInterface[] params) {
|
||||||
return context.getInheritedNumberImplementation().instanceForString("1").divide(functionCos.apply(context, params[0]));
|
return context.getInheritedNumberImplementation().instanceForString("1").divide(functionCos.apply(context, params[0]));
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -353,12 +357,12 @@ public class StandardPlugin extends Plugin {
|
||||||
*/
|
*/
|
||||||
public final NumberFunction functionCsc = new NumberFunction() {
|
public final NumberFunction functionCsc = new NumberFunction() {
|
||||||
@Override
|
@Override
|
||||||
public boolean matchesParams(MutableEvaluationContext context, NumberInterface[] params) {
|
public boolean matchesParams(PluginEvaluationContext context, NumberInterface[] params) {
|
||||||
return params.length == 1;
|
return params.length == 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public NumberInterface applyInternal(MutableEvaluationContext context, NumberInterface[] params) {
|
public NumberInterface applyInternal(PluginEvaluationContext context, NumberInterface[] params) {
|
||||||
return context.getInheritedNumberImplementation().instanceForString("1").divide(functionSin.apply(context, params[0]));
|
return context.getInheritedNumberImplementation().instanceForString("1").divide(functionSin.apply(context, params[0]));
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -367,12 +371,12 @@ public class StandardPlugin extends Plugin {
|
||||||
*/
|
*/
|
||||||
public final NumberFunction functionCot = new NumberFunction() {
|
public final NumberFunction functionCot = new NumberFunction() {
|
||||||
@Override
|
@Override
|
||||||
public boolean matchesParams(MutableEvaluationContext context, NumberInterface[] params) {
|
public boolean matchesParams(PluginEvaluationContext context, NumberInterface[] params) {
|
||||||
return params.length == 1;
|
return params.length == 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public NumberInterface applyInternal(MutableEvaluationContext context, NumberInterface[] params) {
|
public NumberInterface applyInternal(PluginEvaluationContext context, NumberInterface[] params) {
|
||||||
return functionCos.apply(context, params[0]).divide(functionSin.apply(context, params[0]));
|
return functionCos.apply(context, params[0]).divide(functionSin.apply(context, params[0]));
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -382,13 +386,13 @@ public class StandardPlugin extends Plugin {
|
||||||
*/
|
*/
|
||||||
public final NumberFunction functionArcsin = new NumberFunction() {
|
public final NumberFunction functionArcsin = new NumberFunction() {
|
||||||
@Override
|
@Override
|
||||||
public boolean matchesParams(MutableEvaluationContext context, NumberInterface[] params) {
|
public boolean matchesParams(PluginEvaluationContext context, NumberInterface[] params) {
|
||||||
return params.length == 1
|
return params.length == 1
|
||||||
&& FUNCTION_ABS.apply(context, params[0]).compareTo(context.getInheritedNumberImplementation().instanceForString("1")) <= 0;
|
&& FUNCTION_ABS.apply(context, params[0]).compareTo(context.getInheritedNumberImplementation().instanceForString("1")) <= 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public NumberInterface applyInternal(MutableEvaluationContext context, NumberInterface[] params) {
|
public NumberInterface applyInternal(PluginEvaluationContext context, NumberInterface[] params) {
|
||||||
NumberImplementation implementation = context.getInheritedNumberImplementation();
|
NumberImplementation implementation = context.getInheritedNumberImplementation();
|
||||||
if (FUNCTION_ABS.apply(context, params[0]).compareTo(implementation.instanceForString(".8")) >= 0) {
|
if (FUNCTION_ABS.apply(context, params[0]).compareTo(implementation.instanceForString(".8")) >= 0) {
|
||||||
NumberInterface[] newParams = {FUNCTION_SQRT.apply(context, implementation.instanceForString("1").subtract(params[0].multiply(params[0])))};
|
NumberInterface[] newParams = {FUNCTION_SQRT.apply(context, implementation.instanceForString("1").subtract(params[0].multiply(params[0])))};
|
||||||
|
@ -416,12 +420,12 @@ public class StandardPlugin extends Plugin {
|
||||||
*/
|
*/
|
||||||
public final NumberFunction functionArccos = new NumberFunction() {
|
public final NumberFunction functionArccos = new NumberFunction() {
|
||||||
@Override
|
@Override
|
||||||
public boolean matchesParams(MutableEvaluationContext context, NumberInterface[] params) {
|
public boolean matchesParams(PluginEvaluationContext context, NumberInterface[] params) {
|
||||||
return params.length == 1 && FUNCTION_ABS.apply(context, params[0]).compareTo(context.getInheritedNumberImplementation().instanceForString("1")) <= 0;
|
return params.length == 1 && FUNCTION_ABS.apply(context, params[0]).compareTo(context.getInheritedNumberImplementation().instanceForString("1")) <= 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public NumberInterface applyInternal(MutableEvaluationContext context, NumberInterface[] params) {
|
public NumberInterface applyInternal(PluginEvaluationContext context, NumberInterface[] params) {
|
||||||
return piFor(params[0].getClass()).divide(context.getInheritedNumberImplementation().instanceForString("2"))
|
return piFor(params[0].getClass()).divide(context.getInheritedNumberImplementation().instanceForString("2"))
|
||||||
.subtract(functionArcsin.apply(context, params));
|
.subtract(functionArcsin.apply(context, params));
|
||||||
}
|
}
|
||||||
|
@ -432,12 +436,12 @@ public class StandardPlugin extends Plugin {
|
||||||
*/
|
*/
|
||||||
public final NumberFunction functionArccsc = new NumberFunction() {
|
public final NumberFunction functionArccsc = new NumberFunction() {
|
||||||
@Override
|
@Override
|
||||||
public boolean matchesParams(MutableEvaluationContext context, NumberInterface[] params) {
|
public boolean matchesParams(PluginEvaluationContext context, NumberInterface[] params) {
|
||||||
return params.length == 1 && FUNCTION_ABS.apply(context, params[0]).compareTo(context.getInheritedNumberImplementation().instanceForString("1")) >= 0;
|
return params.length == 1 && FUNCTION_ABS.apply(context, params[0]).compareTo(context.getInheritedNumberImplementation().instanceForString("1")) >= 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public NumberInterface applyInternal(MutableEvaluationContext context, NumberInterface[] params) {
|
public NumberInterface applyInternal(PluginEvaluationContext context, NumberInterface[] params) {
|
||||||
NumberInterface[] reciprocalParamArr = {context.getInheritedNumberImplementation().instanceForString("1").divide(params[0])};
|
NumberInterface[] reciprocalParamArr = {context.getInheritedNumberImplementation().instanceForString("1").divide(params[0])};
|
||||||
return functionArcsin.apply(context, reciprocalParamArr);
|
return functionArcsin.apply(context, reciprocalParamArr);
|
||||||
}
|
}
|
||||||
|
@ -448,12 +452,12 @@ public class StandardPlugin extends Plugin {
|
||||||
*/
|
*/
|
||||||
public final NumberFunction functionArcsec = new NumberFunction() {
|
public final NumberFunction functionArcsec = new NumberFunction() {
|
||||||
@Override
|
@Override
|
||||||
public boolean matchesParams(MutableEvaluationContext context, NumberInterface[] params) {
|
public boolean matchesParams(PluginEvaluationContext context, NumberInterface[] params) {
|
||||||
return params.length == 1 && FUNCTION_ABS.apply(context, params[0]).compareTo(context.getInheritedNumberImplementation().instanceForString("1")) >= 0;
|
return params.length == 1 && FUNCTION_ABS.apply(context, params[0]).compareTo(context.getInheritedNumberImplementation().instanceForString("1")) >= 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public NumberInterface applyInternal(MutableEvaluationContext context, NumberInterface[] params) {
|
public NumberInterface applyInternal(PluginEvaluationContext context, NumberInterface[] params) {
|
||||||
NumberInterface[] reciprocalParamArr = {context.getInheritedNumberImplementation().instanceForString("1").divide(params[0])};
|
NumberInterface[] reciprocalParamArr = {context.getInheritedNumberImplementation().instanceForString("1").divide(params[0])};
|
||||||
return functionArccos.apply(context, reciprocalParamArr);
|
return functionArccos.apply(context, reciprocalParamArr);
|
||||||
}
|
}
|
||||||
|
@ -464,12 +468,12 @@ public class StandardPlugin extends Plugin {
|
||||||
*/
|
*/
|
||||||
public final NumberFunction functionArctan = new NumberFunction() {
|
public final NumberFunction functionArctan = new NumberFunction() {
|
||||||
@Override
|
@Override
|
||||||
public boolean matchesParams(MutableEvaluationContext context, NumberInterface[] params) {
|
public boolean matchesParams(PluginEvaluationContext context, NumberInterface[] params) {
|
||||||
return params.length == 1;
|
return params.length == 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public NumberInterface applyInternal(MutableEvaluationContext context, NumberInterface[] params) {
|
public NumberInterface applyInternal(PluginEvaluationContext context, NumberInterface[] params) {
|
||||||
NumberImplementation implementation = context.getInheritedNumberImplementation();
|
NumberImplementation implementation = context.getInheritedNumberImplementation();
|
||||||
if (params[0].signum() == -1) {
|
if (params[0].signum() == -1) {
|
||||||
NumberInterface[] negatedParams = {params[0].negate()};
|
NumberInterface[] negatedParams = {params[0].negate()};
|
||||||
|
@ -506,12 +510,12 @@ public class StandardPlugin extends Plugin {
|
||||||
*/
|
*/
|
||||||
public final NumberFunction functionArccot = new NumberFunction() {
|
public final NumberFunction functionArccot = new NumberFunction() {
|
||||||
@Override
|
@Override
|
||||||
public boolean matchesParams(MutableEvaluationContext context, NumberInterface[] params) {
|
public boolean matchesParams(PluginEvaluationContext context, NumberInterface[] params) {
|
||||||
return params.length == 1;
|
return params.length == 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public NumberInterface applyInternal(MutableEvaluationContext context, NumberInterface[] params) {
|
public NumberInterface applyInternal(PluginEvaluationContext context, NumberInterface[] params) {
|
||||||
return piFor(params[0].getClass()).divide(context.getInheritedNumberImplementation().instanceForString("2"))
|
return piFor(params[0].getClass()).divide(context.getInheritedNumberImplementation().instanceForString("2"))
|
||||||
.subtract(functionArctan.apply(context, params));
|
.subtract(functionArctan.apply(context, params));
|
||||||
}
|
}
|
||||||
|
@ -550,7 +554,7 @@ public class StandardPlugin extends Plugin {
|
||||||
* @param x where the series is evaluated.
|
* @param x where the series is evaluated.
|
||||||
* @return the value of the series
|
* @return the value of the series
|
||||||
*/
|
*/
|
||||||
private static NumberInterface sinTaylor(MutableEvaluationContext context, NumberInterface x) {
|
private static NumberInterface sinTaylor(PluginEvaluationContext context, NumberInterface x) {
|
||||||
NumberInterface power = x, multiplier = x.multiply(x).negate(), currentTerm, sum = x;
|
NumberInterface power = x, multiplier = x.multiply(x).negate(), currentTerm, sum = x;
|
||||||
NumberInterface maxError = x.getMaxError();
|
NumberInterface maxError = x.getMaxError();
|
||||||
int n = 1;
|
int n = 1;
|
||||||
|
@ -569,7 +573,7 @@ public class StandardPlugin extends Plugin {
|
||||||
* @param phi an angle (in radians).
|
* @param phi an angle (in radians).
|
||||||
* @return theta in [0, 2pi) that differs from phi by a multiple of 2pi.
|
* @return theta in [0, 2pi) that differs from phi by a multiple of 2pi.
|
||||||
*/
|
*/
|
||||||
private static NumberInterface getSmallAngle(MutableEvaluationContext context, NumberInterface phi, NumberInterface pi) {
|
private static NumberInterface getSmallAngle(PluginEvaluationContext context, NumberInterface phi, NumberInterface pi) {
|
||||||
NumberInterface twoPi = pi.multiply(context.getInheritedNumberImplementation().instanceForString("2"));
|
NumberInterface twoPi = pi.multiply(context.getInheritedNumberImplementation().instanceForString("2"));
|
||||||
NumberInterface theta = FUNCTION_ABS.apply(context, phi).subtract(twoPi
|
NumberInterface theta = FUNCTION_ABS.apply(context, phi).subtract(twoPi
|
||||||
.multiply(FUNCTION_ABS.apply(context, phi).divide(twoPi).floor())); //Now theta is in [0, 2pi).
|
.multiply(FUNCTION_ABS.apply(context, phi).divide(twoPi).floor())); //Now theta is in [0, 2pi).
|
||||||
|
|
|
@ -9,14 +9,15 @@ import org.nwapw.abacus.tree.nodes.*
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A reduction context that is mutable.
|
* A reduction context that is mutable.
|
||||||
|
*
|
||||||
* @param parent the parent of this context.
|
* @param parent the parent of this context.
|
||||||
* @param numberImplementation the number implementation used in this context.
|
* @param numberImplementation the number implementation used in this context.
|
||||||
* @param reducer the reducer used in this context
|
* @param abacus the abacus instance used.
|
||||||
*/
|
*/
|
||||||
class MutableEvaluationContext(parent: EvaluationContext? = null,
|
class MutableEvaluationContext(parent: EvaluationContext? = null,
|
||||||
numberImplementation: NumberImplementation? = null,
|
numberImplementation: NumberImplementation? = null,
|
||||||
abacus: Abacus? = null) :
|
abacus: Abacus? = null) :
|
||||||
EvaluationContext(parent, numberImplementation, abacus) {
|
PluginEvaluationContext(parent, numberImplementation, abacus) {
|
||||||
|
|
||||||
override var numberImplementation: NumberImplementation? = super.numberImplementation
|
override var numberImplementation: NumberImplementation? = super.numberImplementation
|
||||||
override var abacus: Abacus? = super.abacus
|
override var abacus: Abacus? = super.abacus
|
||||||
|
@ -35,42 +36,11 @@ class MutableEvaluationContext(parent: EvaluationContext? = null,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Sets a variable to a certain [value].
|
|
||||||
* @param name the name of the variable.
|
|
||||||
* @param value the value of the variable.
|
|
||||||
*/
|
|
||||||
fun setVariable(name: String, value: NumberInterface) {
|
|
||||||
variableMap[name] = value
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Set a definition to a certain [value].
|
|
||||||
* @param name the name of the definition.
|
|
||||||
* @param value the value of the definition.
|
|
||||||
*/
|
|
||||||
fun setDefinition(name: String, value: TreeNode) {
|
|
||||||
definitionMap[name] = value
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Clears the variables defined in this context.
|
|
||||||
*/
|
|
||||||
fun clearVariables(){
|
|
||||||
variableMap.clear()
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Clears the definitions defined in this context.
|
|
||||||
*/
|
|
||||||
fun clearDefinitions(){
|
|
||||||
definitionMap.clear()
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun reduceNode(treeNode: TreeNode, vararg children: Any): NumberInterface {
|
override fun reduceNode(treeNode: TreeNode, vararg children: Any): NumberInterface {
|
||||||
|
val oldNumberImplementation = numberImplementation
|
||||||
val abacus = inheritedAbacus
|
val abacus = inheritedAbacus
|
||||||
val promotionManager = abacus.promotionManager
|
val promotionManager = abacus.promotionManager
|
||||||
return when(treeNode){
|
val toReturn = when(treeNode){
|
||||||
is NumberNode -> {
|
is NumberNode -> {
|
||||||
inheritedNumberImplementation.instanceForString(treeNode.number)
|
inheritedNumberImplementation.instanceForString(treeNode.number)
|
||||||
}
|
}
|
||||||
|
@ -114,6 +84,8 @@ class MutableEvaluationContext(parent: EvaluationContext? = null,
|
||||||
}
|
}
|
||||||
else -> throw ReductionException("unrecognized tree node.")
|
else -> throw ReductionException("unrecognized tree node.")
|
||||||
}
|
}
|
||||||
|
numberImplementation = oldNumberImplementation
|
||||||
|
return toReturn
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
|
@ -0,0 +1,58 @@
|
||||||
|
package org.nwapw.abacus.context
|
||||||
|
|
||||||
|
import org.nwapw.abacus.Abacus
|
||||||
|
import org.nwapw.abacus.number.NumberInterface
|
||||||
|
import org.nwapw.abacus.plugin.NumberImplementation
|
||||||
|
import org.nwapw.abacus.tree.nodes.TreeNode
|
||||||
|
|
||||||
|
/**
|
||||||
|
* An evaluation context with limited mutability.
|
||||||
|
*
|
||||||
|
* An evaluation context that is mutable but in a limited way, that is, not allowing the modifications
|
||||||
|
* of variables whose changes might cause issues outside of the function. An example of this would be
|
||||||
|
* the modification of the [numberImplementation], which would cause code paths such as the parsing
|
||||||
|
* of NumberNodes to produce a different type of number than if the function did not run, whcih is unacceptable.
|
||||||
|
*
|
||||||
|
* @param parent the parent of this context.
|
||||||
|
* @param numberImplementation the number implementation used in this context.
|
||||||
|
* @param abacus the abacus instance used.
|
||||||
|
*/
|
||||||
|
abstract class PluginEvaluationContext(parent: EvaluationContext? = null,
|
||||||
|
numberImplementation: NumberImplementation? = null,
|
||||||
|
abacus: Abacus? = null) :
|
||||||
|
EvaluationContext(parent, numberImplementation, abacus) {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sets a variable to a certain [value].
|
||||||
|
* @param name the name of the variable.
|
||||||
|
* @param value the value of the variable.
|
||||||
|
*/
|
||||||
|
fun setVariable(name: String, value: NumberInterface) {
|
||||||
|
variableMap[name] = value
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set a definition to a certain [value].
|
||||||
|
* @param name the name of the definition.
|
||||||
|
* @param value the value of the definition.
|
||||||
|
*/
|
||||||
|
fun setDefinition(name: String, value: TreeNode) {
|
||||||
|
definitionMap[name] = value
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Clears the variables defined in this context.
|
||||||
|
*/
|
||||||
|
fun clearVariables(){
|
||||||
|
variableMap.clear()
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Clears the definitions defined in this context.
|
||||||
|
*/
|
||||||
|
fun clearDefinitions(){
|
||||||
|
definitionMap.clear()
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
|
@ -1,6 +1,7 @@
|
||||||
package org.nwapw.abacus.function
|
package org.nwapw.abacus.function
|
||||||
|
|
||||||
import org.nwapw.abacus.context.MutableEvaluationContext
|
import org.nwapw.abacus.context.MutableEvaluationContext
|
||||||
|
import org.nwapw.abacus.context.PluginEvaluationContext
|
||||||
import org.nwapw.abacus.exception.DomainException
|
import org.nwapw.abacus.exception.DomainException
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -18,7 +19,7 @@ interface Applicable<in T : Any, out O : Any> {
|
||||||
* @param params the parameter array to verify for compatibility.
|
* @param params the parameter array to verify for compatibility.
|
||||||
* @return whether the array can be used with applyInternal.
|
* @return whether the array can be used with applyInternal.
|
||||||
*/
|
*/
|
||||||
fun matchesParams(context: MutableEvaluationContext, params: Array<out T>): Boolean
|
fun matchesParams(context: PluginEvaluationContext, params: Array<out T>): Boolean
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Applies the applicable object to the given parameters,
|
* Applies the applicable object to the given parameters,
|
||||||
|
@ -26,7 +27,7 @@ interface Applicable<in T : Any, out O : Any> {
|
||||||
* @param params the parameters to apply to.
|
* @param params the parameters to apply to.
|
||||||
* @return the result of the application.
|
* @return the result of the application.
|
||||||
*/
|
*/
|
||||||
fun applyInternal(context: MutableEvaluationContext, params: Array<out T>): O
|
fun applyInternal(context: PluginEvaluationContext, params: Array<out T>): O
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* If the parameters can be used with this applicable, returns
|
* If the parameters can be used with this applicable, returns
|
||||||
|
@ -35,7 +36,7 @@ interface Applicable<in T : Any, out O : Any> {
|
||||||
* @param params the parameters to apply to.
|
* @param params the parameters to apply to.
|
||||||
* @return the result of the operation, or null if parameters do not match.
|
* @return the result of the operation, or null if parameters do not match.
|
||||||
*/
|
*/
|
||||||
fun apply(context: MutableEvaluationContext, vararg params: T): O {
|
fun apply(context: PluginEvaluationContext, vararg params: T): O {
|
||||||
if (!matchesParams(context, params))
|
if (!matchesParams(context, params))
|
||||||
throw DomainException("parameters do not match function requirements.")
|
throw DomainException("parameters do not match function requirements.")
|
||||||
return applyInternal(context, params)
|
return applyInternal(context, params)
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
package org.nwapw.abacus.plugin.standard.operator
|
package org.nwapw.abacus.plugin.standard.operator
|
||||||
|
|
||||||
import org.nwapw.abacus.context.MutableEvaluationContext
|
import org.nwapw.abacus.context.PluginEvaluationContext
|
||||||
import org.nwapw.abacus.function.OperatorAssociativity
|
import org.nwapw.abacus.function.OperatorAssociativity
|
||||||
import org.nwapw.abacus.function.OperatorType
|
import org.nwapw.abacus.function.OperatorType
|
||||||
import org.nwapw.abacus.function.interfaces.NumberOperator
|
import org.nwapw.abacus.function.interfaces.NumberOperator
|
||||||
|
@ -13,9 +13,9 @@ import org.nwapw.abacus.number.NumberInterface
|
||||||
*/
|
*/
|
||||||
class OperatorAdd: NumberOperator(OperatorAssociativity.LEFT, OperatorType.BINARY_INFIX, 0) {
|
class OperatorAdd: NumberOperator(OperatorAssociativity.LEFT, OperatorType.BINARY_INFIX, 0) {
|
||||||
|
|
||||||
override fun matchesParams(context: MutableEvaluationContext, params: Array<out NumberInterface>) =
|
override fun matchesParams(context: PluginEvaluationContext, params: Array<out NumberInterface>) =
|
||||||
params.size == 2
|
params.size == 2
|
||||||
override fun applyInternal(context: MutableEvaluationContext, params: Array<out NumberInterface>) =
|
override fun applyInternal(context: PluginEvaluationContext, params: Array<out NumberInterface>) =
|
||||||
params[0] + params[1]
|
params[0] + params[1]
|
||||||
|
|
||||||
}
|
}
|
|
@ -1,6 +1,6 @@
|
||||||
package org.nwapw.abacus.plugin.standard.operator
|
package org.nwapw.abacus.plugin.standard.operator
|
||||||
|
|
||||||
import org.nwapw.abacus.context.MutableEvaluationContext
|
import org.nwapw.abacus.context.PluginEvaluationContext
|
||||||
import org.nwapw.abacus.function.OperatorAssociativity
|
import org.nwapw.abacus.function.OperatorAssociativity
|
||||||
import org.nwapw.abacus.function.OperatorType
|
import org.nwapw.abacus.function.OperatorType
|
||||||
import org.nwapw.abacus.function.interfaces.NumberOperator
|
import org.nwapw.abacus.function.interfaces.NumberOperator
|
||||||
|
@ -14,12 +14,12 @@ import org.nwapw.abacus.plugin.standard.StandardPlugin.*
|
||||||
*/
|
*/
|
||||||
class OperatorCaret: NumberOperator(OperatorAssociativity.RIGHT, OperatorType.BINARY_INFIX, 2) {
|
class OperatorCaret: NumberOperator(OperatorAssociativity.RIGHT, OperatorType.BINARY_INFIX, 2) {
|
||||||
|
|
||||||
override fun matchesParams(context: MutableEvaluationContext, params: Array<out NumberInterface>) =
|
override fun matchesParams(context: PluginEvaluationContext, params: Array<out NumberInterface>) =
|
||||||
params.size == 2
|
params.size == 2
|
||||||
&& !(params[0].signum() == 0 && params[1].signum() == 0)
|
&& !(params[0].signum() == 0 && params[1].signum() == 0)
|
||||||
&& !(params[0].signum() == -1 && !params[1].isInteger())
|
&& !(params[0].signum() == -1 && !params[1].isInteger())
|
||||||
|
|
||||||
override fun applyInternal(context: MutableEvaluationContext, params: Array<out NumberInterface>): NumberInterface {
|
override fun applyInternal(context: PluginEvaluationContext, params: Array<out NumberInterface>): NumberInterface {
|
||||||
val implementation = context.inheritedNumberImplementation
|
val implementation = context.inheritedNumberImplementation
|
||||||
if (params[0].signum() == 0)
|
if (params[0].signum() == 0)
|
||||||
return implementation.instanceForString("0")
|
return implementation.instanceForString("0")
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
package org.nwapw.abacus.plugin.standard.operator
|
package org.nwapw.abacus.plugin.standard.operator
|
||||||
|
|
||||||
import org.nwapw.abacus.context.MutableEvaluationContext
|
import org.nwapw.abacus.context.PluginEvaluationContext
|
||||||
import org.nwapw.abacus.function.OperatorAssociativity
|
import org.nwapw.abacus.function.OperatorAssociativity
|
||||||
import org.nwapw.abacus.function.OperatorType
|
import org.nwapw.abacus.function.OperatorType
|
||||||
import org.nwapw.abacus.function.interfaces.TreeValueOperator
|
import org.nwapw.abacus.function.interfaces.TreeValueOperator
|
||||||
|
@ -16,10 +16,10 @@ import org.nwapw.abacus.tree.nodes.VariableNode
|
||||||
*/
|
*/
|
||||||
class OperatorDefine: TreeValueOperator(OperatorAssociativity.LEFT, OperatorType.BINARY_INFIX, 0) {
|
class OperatorDefine: TreeValueOperator(OperatorAssociativity.LEFT, OperatorType.BINARY_INFIX, 0) {
|
||||||
|
|
||||||
override fun matchesParams(context: MutableEvaluationContext, params: Array<out TreeNode>) =
|
override fun matchesParams(context: PluginEvaluationContext, params: Array<out TreeNode>) =
|
||||||
params.size == 2 && params[0] is VariableNode
|
params.size == 2 && params[0] is VariableNode
|
||||||
|
|
||||||
override fun applyInternal(context: MutableEvaluationContext, params: Array<out TreeNode>): NumberInterface {
|
override fun applyInternal(context: PluginEvaluationContext, params: Array<out TreeNode>): NumberInterface {
|
||||||
val assignTo = (params[0] as VariableNode).variable
|
val assignTo = (params[0] as VariableNode).variable
|
||||||
context.setDefinition(assignTo, params[1])
|
context.setDefinition(assignTo, params[1])
|
||||||
return params[1].reduce(context)
|
return params[1].reduce(context)
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
package org.nwapw.abacus.plugin.standard.operator
|
package org.nwapw.abacus.plugin.standard.operator
|
||||||
|
|
||||||
import org.nwapw.abacus.context.MutableEvaluationContext
|
import org.nwapw.abacus.context.PluginEvaluationContext
|
||||||
import org.nwapw.abacus.function.OperatorAssociativity
|
import org.nwapw.abacus.function.OperatorAssociativity
|
||||||
import org.nwapw.abacus.function.OperatorType
|
import org.nwapw.abacus.function.OperatorType
|
||||||
import org.nwapw.abacus.function.interfaces.NumberOperator
|
import org.nwapw.abacus.function.interfaces.NumberOperator
|
||||||
|
@ -13,9 +13,9 @@ import org.nwapw.abacus.number.NumberInterface
|
||||||
*/
|
*/
|
||||||
class OperatorDivide: NumberOperator(OperatorAssociativity.LEFT, OperatorType.BINARY_INFIX, 1) {
|
class OperatorDivide: NumberOperator(OperatorAssociativity.LEFT, OperatorType.BINARY_INFIX, 1) {
|
||||||
|
|
||||||
override fun matchesParams(context: MutableEvaluationContext, params: Array<out NumberInterface>) =
|
override fun matchesParams(context: PluginEvaluationContext, params: Array<out NumberInterface>) =
|
||||||
params.size == 2
|
params.size == 2
|
||||||
override fun applyInternal(context: MutableEvaluationContext, params: Array<out NumberInterface>) =
|
override fun applyInternal(context: PluginEvaluationContext, params: Array<out NumberInterface>) =
|
||||||
params[0] / params[1]
|
params[0] / params[1]
|
||||||
|
|
||||||
}
|
}
|
|
@ -1,6 +1,6 @@
|
||||||
package org.nwapw.abacus.plugin.standard.operator
|
package org.nwapw.abacus.plugin.standard.operator
|
||||||
|
|
||||||
import org.nwapw.abacus.context.MutableEvaluationContext
|
import org.nwapw.abacus.context.PluginEvaluationContext
|
||||||
import org.nwapw.abacus.function.OperatorAssociativity
|
import org.nwapw.abacus.function.OperatorAssociativity
|
||||||
import org.nwapw.abacus.function.OperatorType
|
import org.nwapw.abacus.function.OperatorType
|
||||||
import org.nwapw.abacus.function.interfaces.NumberOperator
|
import org.nwapw.abacus.function.interfaces.NumberOperator
|
||||||
|
@ -13,12 +13,12 @@ import org.nwapw.abacus.number.NumberInterface
|
||||||
*/
|
*/
|
||||||
class OperatorFactorial: NumberOperator(OperatorAssociativity.LEFT, OperatorType.UNARY_POSTFIX, 0) {
|
class OperatorFactorial: NumberOperator(OperatorAssociativity.LEFT, OperatorType.UNARY_POSTFIX, 0) {
|
||||||
|
|
||||||
override fun matchesParams(context: MutableEvaluationContext, params: Array<out NumberInterface>) =
|
override fun matchesParams(context: PluginEvaluationContext, params: Array<out NumberInterface>) =
|
||||||
params.size == 1
|
params.size == 1
|
||||||
&& params[0].isInteger()
|
&& params[0].isInteger()
|
||||||
&& params[0].signum() >= 0
|
&& params[0].signum() >= 0
|
||||||
|
|
||||||
override fun applyInternal(context: MutableEvaluationContext, params: Array<out NumberInterface>): NumberInterface {
|
override fun applyInternal(context: PluginEvaluationContext, params: Array<out NumberInterface>): NumberInterface {
|
||||||
val implementation = context.inheritedNumberImplementation
|
val implementation = context.inheritedNumberImplementation
|
||||||
val one = implementation.instanceForString("1")
|
val one = implementation.instanceForString("1")
|
||||||
if (params[0].signum() == 0) {
|
if (params[0].signum() == 0) {
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
package org.nwapw.abacus.plugin.standard.operator
|
package org.nwapw.abacus.plugin.standard.operator
|
||||||
|
|
||||||
import org.nwapw.abacus.context.MutableEvaluationContext
|
import org.nwapw.abacus.context.PluginEvaluationContext
|
||||||
import org.nwapw.abacus.function.OperatorAssociativity
|
import org.nwapw.abacus.function.OperatorAssociativity
|
||||||
import org.nwapw.abacus.function.OperatorType
|
import org.nwapw.abacus.function.OperatorType
|
||||||
import org.nwapw.abacus.function.interfaces.NumberOperator
|
import org.nwapw.abacus.function.interfaces.NumberOperator
|
||||||
|
@ -13,9 +13,9 @@ import org.nwapw.abacus.number.NumberInterface
|
||||||
*/
|
*/
|
||||||
class OperatorMultiply: NumberOperator(OperatorAssociativity.LEFT, OperatorType.BINARY_INFIX, 1) {
|
class OperatorMultiply: NumberOperator(OperatorAssociativity.LEFT, OperatorType.BINARY_INFIX, 1) {
|
||||||
|
|
||||||
override fun matchesParams(context: MutableEvaluationContext, params: Array<out NumberInterface>) =
|
override fun matchesParams(context: PluginEvaluationContext, params: Array<out NumberInterface>) =
|
||||||
params.size == 2
|
params.size == 2
|
||||||
override fun applyInternal(context: MutableEvaluationContext, params: Array<out NumberInterface>) =
|
override fun applyInternal(context: PluginEvaluationContext, params: Array<out NumberInterface>) =
|
||||||
params[0] * params[1]
|
params[0] * params[1]
|
||||||
|
|
||||||
}
|
}
|
|
@ -1,6 +1,6 @@
|
||||||
package org.nwapw.abacus.plugin.standard.operator
|
package org.nwapw.abacus.plugin.standard.operator
|
||||||
|
|
||||||
import org.nwapw.abacus.context.MutableEvaluationContext
|
import org.nwapw.abacus.context.PluginEvaluationContext
|
||||||
import org.nwapw.abacus.function.OperatorAssociativity
|
import org.nwapw.abacus.function.OperatorAssociativity
|
||||||
import org.nwapw.abacus.function.OperatorType
|
import org.nwapw.abacus.function.OperatorType
|
||||||
import org.nwapw.abacus.function.interfaces.NumberOperator
|
import org.nwapw.abacus.function.interfaces.NumberOperator
|
||||||
|
@ -16,11 +16,11 @@ import org.nwapw.abacus.plugin.standard.StandardPlugin.OP_NPR
|
||||||
*/
|
*/
|
||||||
class OperatorNcr: NumberOperator(OperatorAssociativity.RIGHT, OperatorType.BINARY_INFIX, 0) {
|
class OperatorNcr: NumberOperator(OperatorAssociativity.RIGHT, OperatorType.BINARY_INFIX, 0) {
|
||||||
|
|
||||||
override fun matchesParams(context: MutableEvaluationContext, params: Array<out NumberInterface>) =
|
override fun matchesParams(context: PluginEvaluationContext, params: Array<out NumberInterface>) =
|
||||||
params.size == 2 && params[0].isInteger()
|
params.size == 2 && params[0].isInteger()
|
||||||
&& params[1].isInteger()
|
&& params[1].isInteger()
|
||||||
|
|
||||||
override fun applyInternal(context: MutableEvaluationContext, params: Array<out NumberInterface>) =
|
override fun applyInternal(context: PluginEvaluationContext, params: Array<out NumberInterface>) =
|
||||||
OP_NPR.apply(context, *params) / OP_FACTORIAL.apply(context, params[1])
|
OP_NPR.apply(context, *params) / OP_FACTORIAL.apply(context, params[1])
|
||||||
|
|
||||||
}
|
}
|
|
@ -1,6 +1,6 @@
|
||||||
package org.nwapw.abacus.plugin.standard.operator
|
package org.nwapw.abacus.plugin.standard.operator
|
||||||
|
|
||||||
import org.nwapw.abacus.context.MutableEvaluationContext
|
import org.nwapw.abacus.context.PluginEvaluationContext
|
||||||
import org.nwapw.abacus.function.OperatorAssociativity
|
import org.nwapw.abacus.function.OperatorAssociativity
|
||||||
import org.nwapw.abacus.function.OperatorType
|
import org.nwapw.abacus.function.OperatorType
|
||||||
import org.nwapw.abacus.function.interfaces.NumberOperator
|
import org.nwapw.abacus.function.interfaces.NumberOperator
|
||||||
|
@ -13,10 +13,10 @@ import org.nwapw.abacus.number.NumberInterface
|
||||||
*/
|
*/
|
||||||
class OperatorNegate: NumberOperator(OperatorAssociativity.LEFT, OperatorType.UNARY_PREFIX, 0) {
|
class OperatorNegate: NumberOperator(OperatorAssociativity.LEFT, OperatorType.UNARY_PREFIX, 0) {
|
||||||
|
|
||||||
override fun matchesParams(context: MutableEvaluationContext, params: Array<out NumberInterface>) =
|
override fun matchesParams(context: PluginEvaluationContext, params: Array<out NumberInterface>) =
|
||||||
params.size == 1
|
params.size == 1
|
||||||
|
|
||||||
override fun applyInternal(context: MutableEvaluationContext, params: Array<out NumberInterface>) =
|
override fun applyInternal(context: PluginEvaluationContext, params: Array<out NumberInterface>) =
|
||||||
-params[0]
|
-params[0]
|
||||||
|
|
||||||
}
|
}
|
|
@ -1,6 +1,6 @@
|
||||||
package org.nwapw.abacus.plugin.standard.operator
|
package org.nwapw.abacus.plugin.standard.operator
|
||||||
|
|
||||||
import org.nwapw.abacus.context.MutableEvaluationContext
|
import org.nwapw.abacus.context.PluginEvaluationContext
|
||||||
import org.nwapw.abacus.function.OperatorAssociativity
|
import org.nwapw.abacus.function.OperatorAssociativity
|
||||||
import org.nwapw.abacus.function.OperatorType
|
import org.nwapw.abacus.function.OperatorType
|
||||||
import org.nwapw.abacus.function.interfaces.NumberOperator
|
import org.nwapw.abacus.function.interfaces.NumberOperator
|
||||||
|
@ -14,11 +14,11 @@ import org.nwapw.abacus.number.NumberInterface
|
||||||
*/
|
*/
|
||||||
class OperatorNpr: NumberOperator(OperatorAssociativity.RIGHT, OperatorType.BINARY_INFIX, 0) {
|
class OperatorNpr: NumberOperator(OperatorAssociativity.RIGHT, OperatorType.BINARY_INFIX, 0) {
|
||||||
|
|
||||||
override fun matchesParams(context: MutableEvaluationContext, params: Array<out NumberInterface>) =
|
override fun matchesParams(context: PluginEvaluationContext, params: Array<out NumberInterface>) =
|
||||||
params.size == 2 && params[0].isInteger()
|
params.size == 2 && params[0].isInteger()
|
||||||
&& params[1].isInteger()
|
&& params[1].isInteger()
|
||||||
|
|
||||||
override fun applyInternal(context: MutableEvaluationContext, params: Array<out NumberInterface>): NumberInterface {
|
override fun applyInternal(context: PluginEvaluationContext, params: Array<out NumberInterface>): NumberInterface {
|
||||||
val implementation = context.inheritedNumberImplementation
|
val implementation = context.inheritedNumberImplementation
|
||||||
if (params[0] < params[1] ||
|
if (params[0] < params[1] ||
|
||||||
params[0].signum() < 0 ||
|
params[0].signum() < 0 ||
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
package org.nwapw.abacus.plugin.standard.operator
|
package org.nwapw.abacus.plugin.standard.operator
|
||||||
|
|
||||||
import org.nwapw.abacus.context.MutableEvaluationContext
|
import org.nwapw.abacus.context.PluginEvaluationContext
|
||||||
import org.nwapw.abacus.function.OperatorAssociativity
|
import org.nwapw.abacus.function.OperatorAssociativity
|
||||||
import org.nwapw.abacus.function.OperatorType
|
import org.nwapw.abacus.function.OperatorType
|
||||||
import org.nwapw.abacus.function.interfaces.TreeValueOperator
|
import org.nwapw.abacus.function.interfaces.TreeValueOperator
|
||||||
|
@ -15,10 +15,10 @@ import org.nwapw.abacus.tree.nodes.VariableNode
|
||||||
*/
|
*/
|
||||||
class OperatorSet: TreeValueOperator(OperatorAssociativity.LEFT, OperatorType.BINARY_INFIX, 0) {
|
class OperatorSet: TreeValueOperator(OperatorAssociativity.LEFT, OperatorType.BINARY_INFIX, 0) {
|
||||||
|
|
||||||
override fun matchesParams(context: MutableEvaluationContext, params: Array<out TreeNode>) =
|
override fun matchesParams(context: PluginEvaluationContext, params: Array<out TreeNode>) =
|
||||||
params.size == 2 && params[0] is VariableNode
|
params.size == 2 && params[0] is VariableNode
|
||||||
|
|
||||||
override fun applyInternal(context: MutableEvaluationContext, params: Array<out TreeNode>): NumberInterface {
|
override fun applyInternal(context: PluginEvaluationContext, params: Array<out TreeNode>): NumberInterface {
|
||||||
val assignTo = (params[0] as VariableNode).variable
|
val assignTo = (params[0] as VariableNode).variable
|
||||||
val value = params[1].reduce(context)
|
val value = params[1].reduce(context)
|
||||||
context.setVariable(assignTo, value)
|
context.setVariable(assignTo, value)
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
package org.nwapw.abacus.plugin.standard.operator
|
package org.nwapw.abacus.plugin.standard.operator
|
||||||
|
|
||||||
import org.nwapw.abacus.context.MutableEvaluationContext
|
import org.nwapw.abacus.context.PluginEvaluationContext
|
||||||
import org.nwapw.abacus.function.OperatorAssociativity
|
import org.nwapw.abacus.function.OperatorAssociativity
|
||||||
import org.nwapw.abacus.function.OperatorType
|
import org.nwapw.abacus.function.OperatorType
|
||||||
import org.nwapw.abacus.function.interfaces.NumberOperator
|
import org.nwapw.abacus.function.interfaces.NumberOperator
|
||||||
|
@ -13,9 +13,9 @@ import org.nwapw.abacus.number.NumberInterface
|
||||||
*/
|
*/
|
||||||
class OperatorSubtract: NumberOperator(OperatorAssociativity.LEFT, OperatorType.BINARY_INFIX, 0) {
|
class OperatorSubtract: NumberOperator(OperatorAssociativity.LEFT, OperatorType.BINARY_INFIX, 0) {
|
||||||
|
|
||||||
override fun matchesParams(context: MutableEvaluationContext, params: Array<out NumberInterface>) =
|
override fun matchesParams(context: PluginEvaluationContext, params: Array<out NumberInterface>) =
|
||||||
params.size == 2
|
params.size == 2
|
||||||
override fun applyInternal(context: MutableEvaluationContext, params: Array<out NumberInterface>) =
|
override fun applyInternal(context: PluginEvaluationContext, params: Array<out NumberInterface>) =
|
||||||
params[0] - params[1]
|
params[0] - params[1]
|
||||||
|
|
||||||
}
|
}
|
|
@ -1,11 +1,13 @@
|
||||||
package org.nwapw.abacus.tests;
|
package org.nwapw.abacus.tests;
|
||||||
|
|
||||||
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.junit.Assert;
|
import org.junit.Assert;
|
||||||
import org.junit.BeforeClass;
|
import org.junit.BeforeClass;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
import org.nwapw.abacus.Abacus;
|
import org.nwapw.abacus.Abacus;
|
||||||
import org.nwapw.abacus.config.Configuration;
|
import org.nwapw.abacus.config.Configuration;
|
||||||
import org.nwapw.abacus.context.MutableEvaluationContext;
|
import org.nwapw.abacus.context.MutableEvaluationContext;
|
||||||
|
import org.nwapw.abacus.context.PluginEvaluationContext;
|
||||||
import org.nwapw.abacus.function.OperatorAssociativity;
|
import org.nwapw.abacus.function.OperatorAssociativity;
|
||||||
import org.nwapw.abacus.function.OperatorType;
|
import org.nwapw.abacus.function.OperatorType;
|
||||||
import org.nwapw.abacus.function.interfaces.NumberFunction;
|
import org.nwapw.abacus.function.interfaces.NumberFunction;
|
||||||
|
@ -24,12 +26,12 @@ public class TokenizerTests {
|
||||||
private static LexerTokenizer lexerTokenizer = new LexerTokenizer();
|
private static LexerTokenizer lexerTokenizer = new LexerTokenizer();
|
||||||
private static NumberFunction subtractFunction = new NumberFunction() {
|
private static NumberFunction subtractFunction = new NumberFunction() {
|
||||||
@Override
|
@Override
|
||||||
public boolean matchesParams(MutableEvaluationContext context, NumberInterface[] params) {
|
public boolean matchesParams(PluginEvaluationContext context, NumberInterface[] params) {
|
||||||
return params.length == 2;
|
return params.length == 2;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public NumberInterface applyInternal(MutableEvaluationContext context, NumberInterface[] params) {
|
public NumberInterface applyInternal(PluginEvaluationContext context, NumberInterface[] params) {
|
||||||
return params[0].subtract(params[1]);
|
return params[0].subtract(params[1]);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -40,12 +42,12 @@ public class TokenizerTests {
|
||||||
0) {
|
0) {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean matchesParams(MutableEvaluationContext context, NumberInterface[] params) {
|
public boolean matchesParams(PluginEvaluationContext context, NumberInterface[] params) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public NumberInterface applyInternal(MutableEvaluationContext context, NumberInterface[] params) {
|
public NumberInterface applyInternal(PluginEvaluationContext context, NumberInterface[] params) {
|
||||||
return subtractFunction.apply(context, params);
|
return subtractFunction.apply(context, params);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
@ -53,12 +55,12 @@ public class TokenizerTests {
|
||||||
0) {
|
0) {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean matchesParams(MutableEvaluationContext context, NumberInterface[] params) {
|
public boolean matchesParams(PluginEvaluationContext context, NumberInterface[] params) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public NumberInterface applyInternal(MutableEvaluationContext context, NumberInterface[] params) {
|
public NumberInterface applyInternal(PluginEvaluationContext context, NumberInterface[] params) {
|
||||||
return subtractFunction.apply(context, params);
|
return subtractFunction.apply(context, params);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in New Issue
Block a user