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

imaginary number in jscl

Browse Source
This commit is contained in:
Sergey Solovyev 2011-11-21 15:11:36 +04:00
parent 57309170e8
commit ce96e028a9
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,15 +34,12 @@ class FromJsclNumericTextProcessor implements TextProcessor<String> {
} }
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
result = result.replace(MathType.INFINITY_JSCL, MathType.INFINITY); result = result.replace(MathType.INFINITY_JSCL, MathType.INFINITY);
if (result.contains(MathType.IMAGINARY_NUMBER_JSCL)) {
try { try {
result = createResultForComplexNumber(result.replace(MathType.IMAGINARY_NUMBER_JSCL, 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);
} }
}
} }
return result; return result;

2
src/test/java/org/solovyev/android/calculator/model/CalculatorEngineTest.java
View File

@ -130,7 +130,7 @@ public class CalculatorEngineTest {
} catch (ParseException e) { } catch (ParseException e) {
} }
try { try {
junit.framework.Assert.assertEquals("i", cm.evaluate(JsclOperation.numeric, "π/π!").getResult()); junit.framework.Assert.assertEquals("1", cm.evaluate(JsclOperation.numeric, "π/π!").getResult());
fail(); fail();
} catch (ParseException e) { } catch (ParseException e) {
} }