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

lg instead log

Browse Source
This commit is contained in:
serso
2011-10-29 11:28:26 +04:00
parent d4bdbd3692
commit fcea2f9e2e
4 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/solovyev/android/calculator/math/Functions.java
View File

@@ -33,7 +33,7 @@ public class Functions {
public final static String ATANH = "atanh";
public final static String LN = "ln";
public final static String LOG = "log";
public final static String LG = "lg";
public final static String MOD = "mod";
public final static String EXP = "exp";
@@ -43,7 +43,7 @@ public class Functions {
public static final List<String> allPrefix;
static {
final List<String> functions = new ArrayList<String>(Arrays.asList(SIN, SINH, ASIN, ASINH, COS, COSH, ACOS, ACOSH, TAN, TANH, ATAN, ATANH, LN, LOG, MOD, SQRT, EXP));
final List<String> functions = new ArrayList<String>(Arrays.asList(SIN, SINH, ASIN, ASINH, COS, COSH, ACOS, ACOSH, TAN, TANH, ATAN, ATANH, LN, LG, MOD, SQRT, EXP));
Collections.sort(functions, new MathEntityComparator());
allPrefix = functions;
}

2
src/main/java/org/solovyev/android/calculator/model/CalculatorEngine.java
View File

@@ -179,6 +179,8 @@ public enum CalculatorEngine {
//Log.d(CalculatorEngine.class.getName(), "Calculation thread started work: " + thread.getName());
calculationThread.setObject(thread);
calculationResult.setObject(finalOperation.evaluate(Expression.valueOf(jsclExpression)));
} catch (ArithmeticException e) {
exception.setObject(new ParseException(e));
} catch (jscl.text.ParseException e) {
exception.setObject(new ParseException(e));
} catch (ParseInterruptedException e) {