TnSb/android-calculatorpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

simplify feature changes

Browse Source
This commit is contained in:
serso
2011-10-20 15:59:24 +04:00
parent 916cc81d25
commit 2753f3f53d
12 changed files with 217 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/org/solovyev/android/calculator/jscl/FromJsclNumericTextProcessor.java
View File

@@ -32,10 +32,10 @@ class FromJsclNumericTextProcessor implements TextProcessor<String> {
result = String.valueOf(roundedValue);
}
} catch (NumberFormatException e) {
result = result.replace(MathType.INFINITY_DEF, MathType.INFINITY);
if (result.contains(MathType.IMAGINARY_NUMBER_DEF)) {
result = result.replace(MathType.INFINITY_JSCL, MathType.INFINITY);
if (result.contains(MathType.IMAGINARY_NUMBER_JSCL)) {
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) {
// throw original one
throw new ParseException(e);

3
src/main/java/org/solovyev/android/calculator/jscl/JsclOperation.java
View File

@@ -8,11 +8,12 @@ package org.solovyev.android.calculator.jscl;
import org.jetbrains.annotations.NotNull;
import org.solovyev.android.calculator.model.DummyTextProcessor;
import org.solovyev.android.calculator.model.FromJsclSimplifyTextProcessor;
import org.solovyev.android.calculator.model.TextProcessor;
public enum JsclOperation {
simplify(DummyTextProcessor.instance),
simplify(new FromJsclSimplifyTextProcessor()),
elementary(DummyTextProcessor.instance),
importCommands(DummyTextProcessor.instance),
numeric(new FromJsclNumericTextProcessor());