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

fix for asin/acos

Browse Source
This commit is contained in:
serso 2011-09-17 12:51:29 +04:00
parent 908103b2d3
commit c99dd57e60
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/org/solovyev/android/calculator/Preprocessor.java
View File

@ -36,6 +36,12 @@ public class Preprocessor {
} else if (s.startsWith("atg", i)) { } else if (s.startsWith("atg", i)) {
sb.append("atan"); sb.append("atan");
i += 2; i += 2;
} else if (s.startsWith("acos", i)) {
sb.append("acos");
i += 3;
} else if (s.startsWith("asin", i)) {
sb.append("asin");
i += 3;
} else if (s.startsWith("e(", i)) { } else if (s.startsWith("e(", i)) {
sb.append("exp("); sb.append("exp(");
i += 1; i += 1;
@ -62,12 +68,12 @@ public class Preprocessor {
if (mathTypeBefore != MathEntityType.binary_operation && if (mathTypeBefore != MathEntityType.binary_operation &&
mathTypeBefore != MathEntityType.unary_operation && mathTypeBefore != MathEntityType.unary_operation &&
mathTypeBefore != MathEntityType.function && mathTypeBefore != MathEntityType.function &&
!MathEntityType.openGroupSymbols.contains(chBefore)) { !MathEntityType.openGroupSymbols.contains(chBefore)) {
if (mathType == MathEntityType.constant ) { if (mathType == MathEntityType.constant) {
sb.append("*"); sb.append("*");
} else if ( MathEntityType.openGroupSymbols.contains(ch) && mathTypeBefore != null ) { } else if (MathEntityType.openGroupSymbols.contains(ch) && mathTypeBefore != null) {
sb.append("*"); sb.append("*");
} else if (mathType == MathEntityType.digit && mathTypeBefore != MathEntityType.digit && mathTypeBefore != MathEntityType.dot) { } else if (mathType == MathEntityType.digit && mathTypeBefore != MathEntityType.digit && mathTypeBefore != MathEntityType.dot) {
sb.append("*"); sb.append("*");