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

new interface implementation

Browse Source
This commit is contained in:
serso
2011-09-10 22:32:54 +04:00
parent 3c62f21fb4
commit 70d0c21c9e
4 changed files with 31 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/org/solovyev/android/calculator/Preprocessor.java
View File

@@ -15,8 +15,12 @@ public class Preprocessor {
sb.append('(');
} else if (ch == ']' || ch == '}') {
sb.append(')');
} else if ( ch == ',' ) {
} else if (ch == ',') {
sb.append('.');
} else if (ch == 'π') {
sb.append("pi");
} else if (ch == '√') {
sb.append("sqrt");
} else {
sb.append(ch);
}
@@ -24,8 +28,8 @@ public class Preprocessor {
return sb.toString();
}
public static String wrap (@NotNull JsclOperation operation, @NotNull String s) {
return operation.name() + "(\"" + s + "\");";
public static String wrap(@NotNull JsclOperation operation, @NotNull String s) {
return operation.name() + "(\"" + s + "\");";
}
}

2
src/org/solovyev/util/math/MathEntityType.java
View File

@@ -19,7 +19,7 @@ public enum MathEntityType {
private static final List<Character> binaryOperations = Arrays.asList('-', '+', '*', '/', '^' );
private static final List<String> functions = Arrays.asList("sin", "asin", "cos", "acos", "tg", "atg", "exp", "log", "ln", "mod", "sqrt");
private static final List<String> functions = Arrays.asList("sin", "asin", "cos", "acos", "tg", "atg", "exp", "log", "ln", "mod", "√");
private static final List<String> groupSymbols = Arrays.asList("[]", "()", "{}");