simplify feature changes
This commit is contained in:
parent
916cc81d25
commit
2753f3f53d
@ -32,10 +32,10 @@ class FromJsclNumericTextProcessor implements TextProcessor<String> {
|
|||||||
result = String.valueOf(roundedValue);
|
result = String.valueOf(roundedValue);
|
||||||
}
|
}
|
||||||
} catch (NumberFormatException e) {
|
} catch (NumberFormatException e) {
|
||||||
result = result.replace(MathType.INFINITY_DEF, MathType.INFINITY);
|
result = result.replace(MathType.INFINITY_JSCL, MathType.INFINITY);
|
||||||
if (result.contains(MathType.IMAGINARY_NUMBER_DEF)) {
|
if (result.contains(MathType.IMAGINARY_NUMBER_JSCL)) {
|
||||||
try {
|
try {
|
||||||
result = createResultForComplexNumber(result.replace(MathType.IMAGINARY_NUMBER_DEF, MathType.IMAGINARY_NUMBER));
|
result = createResultForComplexNumber(result.replace(MathType.IMAGINARY_NUMBER_JSCL, MathType.IMAGINARY_NUMBER));
|
||||||
} catch (NumberFormatException e1) {
|
} catch (NumberFormatException e1) {
|
||||||
// throw original one
|
// throw original one
|
||||||
throw new ParseException(e);
|
throw new ParseException(e);
|
||||||
|
@ -8,11 +8,12 @@ package org.solovyev.android.calculator.jscl;
|
|||||||
|
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.solovyev.android.calculator.model.DummyTextProcessor;
|
import org.solovyev.android.calculator.model.DummyTextProcessor;
|
||||||
|
import org.solovyev.android.calculator.model.FromJsclSimplifyTextProcessor;
|
||||||
import org.solovyev.android.calculator.model.TextProcessor;
|
import org.solovyev.android.calculator.model.TextProcessor;
|
||||||
|
|
||||||
public enum JsclOperation {
|
public enum JsclOperation {
|
||||||
|
|
||||||
simplify(DummyTextProcessor.instance),
|
simplify(new FromJsclSimplifyTextProcessor()),
|
||||||
elementary(DummyTextProcessor.instance),
|
elementary(DummyTextProcessor.instance),
|
||||||
importCommands(DummyTextProcessor.instance),
|
importCommands(DummyTextProcessor.instance),
|
||||||
numeric(new FromJsclNumericTextProcessor());
|
numeric(new FromJsclNumericTextProcessor());
|
||||||
|
@ -31,20 +31,20 @@ public class Functions {
|
|||||||
public final static String TANH = "tanh";
|
public final static String TANH = "tanh";
|
||||||
public final static String ATAN = "atan";
|
public final static String ATAN = "atan";
|
||||||
public final static String ATANH = "atanh";
|
public final static String ATANH = "atanh";
|
||||||
public final static String LOG = "log";
|
|
||||||
public final static String LN = "ln";
|
public final static String LN = "ln";
|
||||||
|
public final static String LN_JSCL = "log";
|
||||||
|
|
||||||
public final static String MOD = "mod";
|
public final static String MOD = "mod";
|
||||||
public final static String EXP = "exp";
|
public final static String EXP = "exp";
|
||||||
public final static String SQRT_SIGN = "√";
|
|
||||||
public final static String SQRT = "sqrt";
|
|
||||||
|
|
||||||
public final static String E = "E";
|
public final static String SQRT = "√";
|
||||||
public final static String E_POWER = "10^";
|
public final static String SQRT_JSCL = "sqrt";
|
||||||
|
|
||||||
public static final List<String> allPrefix;
|
public static final List<String> allPrefix;
|
||||||
|
|
||||||
static {
|
static {
|
||||||
final List<String> functions = new ArrayList<String>(Arrays.asList(SIN, SINH, ASIN, ASINH, COS, COSH, ACOS, ACOSH, TAN, TANH, ATAN, ATANH, LOG, LN, MOD, SQRT, SQRT_SIGN, EXP, E));
|
final List<String> functions = new ArrayList<String>(Arrays.asList(SIN, SINH, ASIN, ASINH, COS, COSH, ACOS, ACOSH, TAN, TANH, ATAN, ATANH, LN, LN_JSCL, MOD, SQRT, SQRT_JSCL, EXP));
|
||||||
Collections.sort(functions, new MathEntityComparator());
|
Collections.sort(functions, new MathEntityComparator());
|
||||||
allPrefix = functions;
|
allPrefix = functions;
|
||||||
}
|
}
|
||||||
|
@ -19,8 +19,9 @@ import static org.solovyev.common.utils.CollectionsUtils.get;
|
|||||||
public enum MathType {
|
public enum MathType {
|
||||||
|
|
||||||
digit,
|
digit,
|
||||||
constant,
|
|
||||||
dot,
|
dot,
|
||||||
|
power_10,
|
||||||
|
constant,
|
||||||
function,
|
function,
|
||||||
postfix_function,
|
postfix_function,
|
||||||
unary_operation,
|
unary_operation,
|
||||||
@ -30,13 +31,16 @@ public enum MathType {
|
|||||||
close_group_symbol,
|
close_group_symbol,
|
||||||
text;
|
text;
|
||||||
|
|
||||||
|
public final static Character POWER_10 = 'E';
|
||||||
|
public final static String POWER_10_JSCL = "10^";
|
||||||
|
|
||||||
public static final String IMAGINARY_NUMBER = "i";
|
public static final String IMAGINARY_NUMBER = "i";
|
||||||
public static final String IMAGINARY_NUMBER_DEF = "sqrt(-1)";
|
public static final String IMAGINARY_NUMBER_JSCL = "sqrt(-1)";
|
||||||
public static final String PI = "π";
|
public static final String PI = "π";
|
||||||
public static final String E = "e";
|
public static final String E = "e";
|
||||||
public final static String NAN = "NaN";
|
public final static String NAN = "NaN";
|
||||||
public final static String INFINITY = "∞";
|
public final static String INFINITY = "∞";
|
||||||
public final static String INFINITY_DEF = "Infinity";
|
public final static String INFINITY_JSCL = "Infinity";
|
||||||
|
|
||||||
public static final List<String> constants = Arrays.asList(E, PI, IMAGINARY_NUMBER, NAN, INFINITY);
|
public static final List<String> constants = Arrays.asList(E, PI, IMAGINARY_NUMBER, NAN, INFINITY);
|
||||||
|
|
||||||
@ -44,6 +48,7 @@ public enum MathType {
|
|||||||
|
|
||||||
public static final List<Character> dots = Arrays.asList('.');
|
public static final List<Character> dots = Arrays.asList('.');
|
||||||
|
|
||||||
|
|
||||||
public static final List<Character> unaryOperations = Arrays.asList('-', '=', '!');
|
public static final List<Character> unaryOperations = Arrays.asList('-', '=', '!');
|
||||||
|
|
||||||
public static final List<Character> binaryOperations = Arrays.asList('-', '+', '*', '×', '∙', '/', '^');
|
public static final List<Character> binaryOperations = Arrays.asList('-', '+', '*', '×', '∙', '/', '^');
|
||||||
@ -88,6 +93,11 @@ public enum MathType {
|
|||||||
return new Result(dot, String.valueOf(foundCharacter));
|
return new Result(dot, String.valueOf(foundCharacter));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
foundCharacter = characterStartWithFinder.isFound(POWER_10) ? POWER_10 : null;
|
||||||
|
if (foundCharacter != null) {
|
||||||
|
return new Result(power_10, String.valueOf(foundCharacter));
|
||||||
|
}
|
||||||
|
|
||||||
foundCharacter = get(postfixFunctions, characterStartWithFinder);
|
foundCharacter = get(postfixFunctions, characterStartWithFinder);
|
||||||
if (foundCharacter != null) {
|
if (foundCharacter != null) {
|
||||||
return new Result(postfix_function, String.valueOf(foundCharacter));
|
return new Result(postfix_function, String.valueOf(foundCharacter));
|
||||||
|
@ -20,6 +20,6 @@ public enum DummyTextProcessor implements TextProcessor<String> {
|
|||||||
@NotNull
|
@NotNull
|
||||||
@Override
|
@Override
|
||||||
public String process(@NotNull String s) throws ParseException {
|
public String process(@NotNull String s) throws ParseException {
|
||||||
return s.replace(ToJsclTextProcessor.SPECIAL_STRING, "");
|
return s;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,96 @@
|
|||||||
|
package org.solovyev.android.calculator.model;
|
||||||
|
|
||||||
|
import org.jetbrains.annotations.NotNull;
|
||||||
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
import org.solovyev.android.calculator.StartsWithFinder;
|
||||||
|
import org.solovyev.android.calculator.math.MathType;
|
||||||
|
import org.solovyev.common.utils.CollectionsUtils;
|
||||||
|
import org.solovyev.common.utils.Finder;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* User: serso
|
||||||
|
* Date: 10/20/11
|
||||||
|
* Time: 2:59 PM
|
||||||
|
*/
|
||||||
|
public class FromJsclSimplifyTextProcessor implements TextProcessor<String> {
|
||||||
|
|
||||||
|
@NotNull
|
||||||
|
@Override
|
||||||
|
public String process(@NotNull String s) throws ParseException {
|
||||||
|
final StringBuilder sb = new StringBuilder();
|
||||||
|
|
||||||
|
MathType.Result mathTypeResult = null;
|
||||||
|
StringBuilder numberBuilder = null;
|
||||||
|
String number = null;
|
||||||
|
for (int i = 0; i < s.length(); i++) {
|
||||||
|
char ch = s.charAt(i);
|
||||||
|
|
||||||
|
mathTypeResult = MathType.getType(s, i);
|
||||||
|
|
||||||
|
final MathType mathType = mathTypeResult.getMathType();
|
||||||
|
|
||||||
|
number = null;
|
||||||
|
if (mathType == MathType.digit || mathType == MathType.dot || mathType == MathType.power_10) {
|
||||||
|
if (numberBuilder == null) {
|
||||||
|
numberBuilder = new StringBuilder();
|
||||||
|
}
|
||||||
|
numberBuilder.append(mathTypeResult.getMatch());
|
||||||
|
} else {
|
||||||
|
if (numberBuilder != null) {
|
||||||
|
try {
|
||||||
|
number = numberBuilder.toString();
|
||||||
|
Double.valueOf(number);
|
||||||
|
} catch (NumberFormatException e) {
|
||||||
|
number = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
numberBuilder = null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
replaceSystemVars(sb, number);
|
||||||
|
|
||||||
|
if (mathType == MathType.constant) {
|
||||||
|
sb.append(mathTypeResult.getMatch());
|
||||||
|
i += mathTypeResult.getMatch().length() - 1;
|
||||||
|
} else if (ch == '*') {
|
||||||
|
sb.append("×");
|
||||||
|
} else {
|
||||||
|
sb.append(ch);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (numberBuilder != null) {
|
||||||
|
try {
|
||||||
|
number = numberBuilder.toString();
|
||||||
|
Double.valueOf(number);
|
||||||
|
} catch (NumberFormatException e) {
|
||||||
|
number = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
numberBuilder = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
replaceSystemVars(sb, number);
|
||||||
|
|
||||||
|
return sb.toString();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void replaceSystemVars(StringBuilder sb, String number) {
|
||||||
|
if (number != null) {
|
||||||
|
final String finalNumber = number;
|
||||||
|
final Var var = CollectionsUtils.get(CalculatorEngine.instance.getVarsRegister().getSystemVars(), new Finder<Var>() {
|
||||||
|
@Override
|
||||||
|
public boolean isFound(@Nullable Var var) {
|
||||||
|
return var != null && finalNumber.equals(var.getValue());
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
if (var != null) {
|
||||||
|
sb.delete(sb.length() - number.length(), sb.length());
|
||||||
|
sb.append(var.getName());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -14,6 +14,11 @@ import org.solovyev.common.exceptions.SersoException;
|
|||||||
* Time: 9:25 PM
|
* Time: 9:25 PM
|
||||||
*/
|
*/
|
||||||
public class ParseException extends SersoException {
|
public class ParseException extends SersoException {
|
||||||
|
|
||||||
|
public ParseException(String message) {
|
||||||
|
super(message);
|
||||||
|
}
|
||||||
|
|
||||||
public ParseException(Throwable cause) {
|
public ParseException(Throwable cause) {
|
||||||
super(cause);
|
super(cause);
|
||||||
}
|
}
|
||||||
|
@ -21,11 +21,9 @@ import java.util.List;
|
|||||||
|
|
||||||
class ToJsclTextProcessor implements TextProcessor<PreparedExpression> {
|
class ToJsclTextProcessor implements TextProcessor<PreparedExpression> {
|
||||||
|
|
||||||
public static final String SPECIAL_STRING = "☀☀☀";
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@NotNull
|
@NotNull
|
||||||
public PreparedExpression process(@NotNull String s) {
|
public PreparedExpression process(@NotNull String s) throws ParseException {
|
||||||
|
|
||||||
final StartsWithFinder startsWithFinder = new StartsWithFinder(s, 0);
|
final StartsWithFinder startsWithFinder = new StartsWithFinder(s, 0);
|
||||||
final StringBuilder sb = new StringBuilder();
|
final StringBuilder sb = new StringBuilder();
|
||||||
@ -44,6 +42,8 @@ class ToJsclTextProcessor implements TextProcessor<PreparedExpression> {
|
|||||||
sb.append(')');
|
sb.append(')');
|
||||||
} else if (ch == '×' || ch == '∙') {
|
} else if (ch == '×' || ch == '∙') {
|
||||||
sb.append("*");
|
sb.append("*");
|
||||||
|
} else if (mathType == MathType.power_10) {
|
||||||
|
sb.append(MathType.POWER_10_JSCL);
|
||||||
} else if (mathType == MathType.function) {
|
} else if (mathType == MathType.function) {
|
||||||
sb.append(toJsclFunction(mathTypeResult.getMatch()));
|
sb.append(toJsclFunction(mathTypeResult.getMatch()));
|
||||||
i += mathTypeResult.getMatch().length() - 1;
|
i += mathTypeResult.getMatch().length() - 1;
|
||||||
@ -51,9 +51,10 @@ class ToJsclTextProcessor implements TextProcessor<PreparedExpression> {
|
|||||||
// NOTE: fix for jscl for EMPTY functions processing (see tests)
|
// NOTE: fix for jscl for EMPTY functions processing (see tests)
|
||||||
startsWithFinder.setI(i + 1);
|
startsWithFinder.setI(i + 1);
|
||||||
if ( i < s.length() && CollectionsUtils.get(MathType.groupSymbols, startsWithFinder) != null) {
|
if ( i < s.length() && CollectionsUtils.get(MathType.groupSymbols, startsWithFinder) != null) {
|
||||||
i += 2;
|
throw new ParseException("Empty function: " + mathTypeResult.getMatch());
|
||||||
|
/*i += 2;
|
||||||
sb.append("(" + SPECIAL_STRING + ")");
|
sb.append("(" + SPECIAL_STRING + ")");
|
||||||
mathTypeResult = new MathType.Result(MathType.close_group_symbol, ")");
|
mathTypeResult = new MathType.Result(MathType.close_group_symbol, ")");*/
|
||||||
}
|
}
|
||||||
} else if (mathType == MathType.constant) {
|
} else if (mathType == MathType.constant) {
|
||||||
sb.append(mathTypeResult.getMatch());
|
sb.append(mathTypeResult.getMatch());
|
||||||
@ -167,11 +168,9 @@ class ToJsclTextProcessor implements TextProcessor<PreparedExpression> {
|
|||||||
final String result;
|
final String result;
|
||||||
|
|
||||||
if (function.equals(Functions.LN)) {
|
if (function.equals(Functions.LN)) {
|
||||||
result = Functions.LOG;
|
result = Functions.LN_JSCL;
|
||||||
} else if (function.equals(Functions.SQRT_SIGN)) {
|
} else if (function.equals(Functions.SQRT)) {
|
||||||
result = Functions.SQRT;
|
result = Functions.SQRT_JSCL;
|
||||||
} else if (function.equals(Functions.E)) {
|
|
||||||
result = Functions.E_POWER;
|
|
||||||
} else {
|
} else {
|
||||||
result = function;
|
result = function;
|
||||||
}
|
}
|
||||||
@ -215,11 +214,14 @@ class ToJsclTextProcessor implements TextProcessor<PreparedExpression> {
|
|||||||
|
|
||||||
if (mathTypeBefore == MathType.constant || (mathTypeBefore != MathType.binary_operation &&
|
if (mathTypeBefore == MathType.constant || (mathTypeBefore != MathType.binary_operation &&
|
||||||
mathTypeBefore != MathType.unary_operation &&
|
mathTypeBefore != MathType.unary_operation &&
|
||||||
|
mathTypeBefore != MathType.power_10 &&
|
||||||
mathTypeBefore != MathType.function &&
|
mathTypeBefore != MathType.function &&
|
||||||
mathTypeBefore != MathType.open_group_symbol)) {
|
mathTypeBefore != MathType.open_group_symbol)) {
|
||||||
|
|
||||||
if (mathType == MathType.constant) {
|
if (mathType == MathType.constant) {
|
||||||
sb.append("*");
|
sb.append("*");
|
||||||
|
} else if (mathType == MathType.power_10) {
|
||||||
|
sb.append("*");
|
||||||
} else if (mathType == MathType.open_group_symbol && mathTypeBefore != null) {
|
} else if (mathType == MathType.open_group_symbol && mathTypeBefore != null) {
|
||||||
sb.append("*");
|
sb.append("*");
|
||||||
} else if (mathType == MathType.digit && ((mathTypeBefore != MathType.digit && mathTypeBefore != MathType.dot) || mathTypeBefore == MathType.constant)) {
|
} else if (mathType == MathType.digit && ((mathTypeBefore != MathType.digit && mathTypeBefore != MathType.dot) || mathTypeBefore == MathType.constant)) {
|
||||||
|
@ -149,13 +149,13 @@ class VarsRegisterImpl implements VarsRegister {
|
|||||||
builder = new Var.Builder(systemVarName, Math.PI);
|
builder = new Var.Builder(systemVarName, Math.PI);
|
||||||
varDescription = R.string.c_pi_description;
|
varDescription = R.string.c_pi_description;
|
||||||
} else if (systemVarName.equals(MathType.IMAGINARY_NUMBER)) {
|
} else if (systemVarName.equals(MathType.IMAGINARY_NUMBER)) {
|
||||||
builder = new Var.Builder(systemVarName, MathType.IMAGINARY_NUMBER_DEF);
|
builder = new Var.Builder(systemVarName, MathType.IMAGINARY_NUMBER_JSCL);
|
||||||
varDescription = R.string.c_i_description;
|
varDescription = R.string.c_i_description;
|
||||||
} else if (systemVarName.equals(MathType.NAN)) {
|
} else if (systemVarName.equals(MathType.NAN)) {
|
||||||
builder = new Var.Builder(systemVarName, MathType.NAN);
|
builder = new Var.Builder(systemVarName, MathType.NAN);
|
||||||
varDescription = R.string.c_nan_description;
|
varDescription = R.string.c_nan_description;
|
||||||
} else if (systemVarName.equals(MathType.INFINITY)) {
|
} else if (systemVarName.equals(MathType.INFINITY)) {
|
||||||
builder = new Var.Builder(systemVarName, MathType.INFINITY_DEF);
|
builder = new Var.Builder(systemVarName, MathType.INFINITY_JSCL);
|
||||||
varDescription = R.string.c_infinity_description;
|
varDescription = R.string.c_infinity_description;
|
||||||
} else {
|
} else {
|
||||||
throw new IllegalArgumentException(systemVarName + " is not supported yet!");
|
throw new IllegalArgumentException(systemVarName + " is not supported yet!");
|
||||||
|
@ -52,13 +52,13 @@ public class CalculatorEngineTest {
|
|||||||
try {
|
try {
|
||||||
cm.evaluate(JsclOperation.numeric, "cos(cos(cos(cos(acos(acos(acos(acos(acos(acos(acos(acos(cos(cos(cos(cos(cosh(acos(cos(cos(cos(cos(cos(acos(acos(acos(acos(acos(acos(acos(acos(cos(cos(cos(cos(cosh(acos(cos())))))))))))))))))))))))))))))))))))))");
|
cm.evaluate(JsclOperation.numeric, "cos(cos(cos(cos(acos(acos(acos(acos(acos(acos(acos(acos(cos(cos(cos(cos(cosh(acos(cos(cos(cos(cos(cos(acos(acos(acos(acos(acos(acos(acos(acos(cos(cos(cos(cos(cosh(acos(cos())))))))))))))))))))))))))))))))))))))");
|
||||||
Assert.fail();
|
Assert.fail();
|
||||||
} catch (EvalError e){
|
} catch (ParseException e){
|
||||||
}
|
}
|
||||||
Assert.assertEquals("NaN", cm.evaluate(JsclOperation.numeric, "ln(ln(ln(ln(ln(ln(ln(ln(ln(ln(ln(ln(ln(ln(ln(100)))))))))))))))"));
|
Assert.assertEquals("NaN", cm.evaluate(JsclOperation.numeric, "ln(ln(ln(ln(ln(ln(ln(ln(ln(ln(ln(ln(ln(ln(ln(100)))))))))))))))"));
|
||||||
try {
|
try {
|
||||||
cm.evaluate(JsclOperation.numeric, "cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos())))))))))))))))))))))))))))))))))))");
|
cm.evaluate(JsclOperation.numeric, "cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos())))))))))))))))))))))))))))))))))))");
|
||||||
Assert.fail();
|
Assert.fail();
|
||||||
} catch (EvalError e){
|
} catch (ParseException e){
|
||||||
}
|
}
|
||||||
Assert.assertEquals("0.73909", cm.evaluate(JsclOperation.numeric, "cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(1))))))))))))))))))))))))))))))))))))"));
|
Assert.assertEquals("0.73909", cm.evaluate(JsclOperation.numeric, "cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(cos(1))))))))))))))))))))))))))))))))))))"));
|
||||||
|
|
||||||
|
@ -0,0 +1,32 @@
|
|||||||
|
package org.solovyev.android.calculator.model;
|
||||||
|
|
||||||
|
import org.junit.Assert;
|
||||||
|
import org.junit.Before;
|
||||||
|
import org.junit.BeforeClass;
|
||||||
|
import org.junit.Test;
|
||||||
|
import org.solovyev.android.calculator.jscl.JsclOperation;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* User: serso
|
||||||
|
* Date: 10/20/11
|
||||||
|
* Time: 3:43 PM
|
||||||
|
*/
|
||||||
|
public class FromJsclSimplifyTextProcessorTest {
|
||||||
|
|
||||||
|
@BeforeClass
|
||||||
|
public static void setUp() throws Exception {
|
||||||
|
CalculatorEngine.instance.init(null, null);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void testProcess() throws Exception {
|
||||||
|
FromJsclSimplifyTextProcessor tp = new FromJsclSimplifyTextProcessor();
|
||||||
|
Assert.assertEquals("t11×e", tp.process("t11*2.718281828459045"));
|
||||||
|
Assert.assertEquals("e", tp.process("2.718281828459045"));
|
||||||
|
Assert.assertEquals("te×e", tp.process("t2.718281828459045*2.718281828459045"));
|
||||||
|
|
||||||
|
CalculatorEngine.instance.getVarsRegister().addVar(null, new Var.Builder("t2.718281828459045", "2"));
|
||||||
|
Assert.assertEquals("t2.718281828459045×e", tp.process("t2.718281828459045*2.718281828459045"));
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
@ -9,6 +9,7 @@ package org.solovyev.android.calculator.model;
|
|||||||
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.solovyev.android.calculator.jscl.JsclOperation;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* User: serso
|
* User: serso
|
||||||
@ -26,19 +27,49 @@ public class ToJsclTextProcessorTest {
|
|||||||
public void testProcess() throws Exception {
|
public void testProcess() throws Exception {
|
||||||
final ToJsclTextProcessor preprocessor = new ToJsclTextProcessor();
|
final ToJsclTextProcessor preprocessor = new ToJsclTextProcessor();
|
||||||
|
|
||||||
Assert.assertEquals( "sin(4)*cos(5)", preprocessor.process("sin(4)cos(5)"));
|
Assert.assertEquals( "sin(4)*asin(0.5)*sqrt(2)", preprocessor.process("sin(4)asin(0.5)sqrt(2)").toString());
|
||||||
Assert.assertEquals( "3.141592653589793*sin(4)*3.141592653589793*cos(sqrt(5))", preprocessor.process("πsin(4)πcos(√(5))"));
|
Assert.assertEquals( "sin(4)*cos(5)", preprocessor.process("sin(4)cos(5)").toString());
|
||||||
Assert.assertEquals( "3.141592653589793*sin(4)+3.141592653589793*cos(sqrt(5))", preprocessor.process("πsin(4)+πcos(√(5))"));
|
Assert.assertEquals( "3.141592653589793*sin(4)*3.141592653589793*cos(sqrt(5))", preprocessor.process("πsin(4)πcos(√(5))").toString());
|
||||||
Assert.assertEquals( "3.141592653589793*sin(4)+3.141592653589793*cos(sqrt(5+sqrt(-1)))", preprocessor.process("πsin(4)+πcos(√(5+i))"));
|
Assert.assertEquals( "3.141592653589793*sin(4)+3.141592653589793*cos(sqrt(5))", preprocessor.process("πsin(4)+πcos(√(5))").toString());
|
||||||
Assert.assertEquals( "3.141592653589793*sin(4.01)+3.141592653589793*cos(sqrt(5+sqrt(-1)))", preprocessor.process("πsin(4.01)+πcos(√(5+i))"));
|
Assert.assertEquals( "3.141592653589793*sin(4)+3.141592653589793*cos(sqrt(5+sqrt(-1)))", preprocessor.process("πsin(4)+πcos(√(5+i))").toString());
|
||||||
Assert.assertEquals( "2.718281828459045^3.141592653589793*sin(4.01)+3.141592653589793*cos(sqrt(5+sqrt(-1)))", preprocessor.process("e^πsin(4.01)+πcos(√(5+i))"));
|
Assert.assertEquals( "3.141592653589793*sin(4.01)+3.141592653589793*cos(sqrt(5+sqrt(-1)))", preprocessor.process("πsin(4.01)+πcos(√(5+i))").toString());
|
||||||
Assert.assertEquals( "2.718281828459045^3.141592653589793*sin(4.01)+3.141592653589793*cos(sqrt(5+sqrt(-1)))*10^2", preprocessor.process("e^πsin(4.01)+πcos(√(5+i))E2"));
|
Assert.assertEquals( "2.718281828459045^3.141592653589793*sin(4.01)+3.141592653589793*cos(sqrt(5+sqrt(-1)))", preprocessor.process("e^πsin(4.01)+πcos(√(5+i))").toString());
|
||||||
Assert.assertEquals( "2.718281828459045^3.141592653589793*sin(4.01)+3.141592653589793*cos(sqrt(5+sqrt(-1)))*10^-2", preprocessor.process("e^πsin(4.01)+πcos(√(5+i))E-2"));
|
Assert.assertEquals( "2.718281828459045^3.141592653589793*sin(4.01)+3.141592653589793*cos(sqrt(5+sqrt(-1)))*10^2", preprocessor.process("e^πsin(4.01)+πcos(√(5+i))E2").toString());
|
||||||
Assert.assertEquals( "log(foo)", preprocessor.process("ln()"));
|
Assert.assertEquals( "2.718281828459045^3.141592653589793*sin(4.01)+3.141592653589793*cos(sqrt(5+sqrt(-1)))*10^-2", preprocessor.process("e^πsin(4.01)+πcos(√(5+i))E-2").toString());
|
||||||
Assert.assertEquals( "log(foo)*log(foo)", preprocessor.process("ln()ln()"));
|
Assert.assertEquals( "10^2", preprocessor.process("E2").toString());
|
||||||
Assert.assertEquals( "2.718281828459045*log(foo)*2.718281828459045*log(foo)*log(foo)*log(foo)*log(foo)*2.718281828459045", preprocessor.process("eln()eln()ln()ln()ln()e"));
|
Assert.assertEquals( "10^-2", preprocessor.process("E-2").toString());
|
||||||
Assert.assertEquals( "log(log(log(log(log(log(log(log(log(log(log(log(log(log(log(foo)))))))))))))))", preprocessor.process("ln(ln(ln(ln(ln(ln(ln(ln(ln(ln(ln(ln(ln(ln(ln()))))))))))))))"));
|
Assert.assertEquals( "10^-1/2", preprocessor.process("E-1/2").toString());
|
||||||
|
Assert.assertEquals( "10^-1.2", preprocessor.process("E-1.2").toString());
|
||||||
|
Assert.assertEquals( "10^(-1.2)", preprocessor.process("E(-1.2)").toString());
|
||||||
|
Assert.assertEquals( "10^10^", preprocessor.process("EE").toString());
|
||||||
|
try {
|
||||||
|
preprocessor.process("ln()");
|
||||||
|
Assert.fail();
|
||||||
|
} catch (ParseException e) {
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
preprocessor.process("ln()ln()");
|
||||||
|
Assert.fail();
|
||||||
|
} catch (ParseException e) {
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
preprocessor.process("eln()eln()ln()ln()ln()e");
|
||||||
|
Assert.fail();
|
||||||
|
} catch (ParseException e) {
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
preprocessor.process("ln(ln(ln(ln(ln(ln(ln(ln(ln(ln(ln(ln(ln(ln(ln()))))))))))))))");
|
||||||
|
Assert.fail();
|
||||||
|
} catch (ParseException e) {
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
preprocessor.process("cos(cos(cos(cos(acos(acos(acos(acos(acos(acos(acos(acos(cos(cos(cos(cos(cosh(acos(cos(cos(cos(cos(cos(acos(acos(acos(acos(acos(acos(acos(acos(cos(cos(cos(cos(cosh(acos(cos())))))))))))))))))))))))))))))))))))))");
|
||||||
|
Assert.fail();
|
||||||
|
} catch (ParseException e) {
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
Loading…
Reference in New Issue
Block a user