diff --git a/pom.xml b/pom.xml index e7c475ff..c54147fc 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ org.solovyev.android calculator - 0.0.1 + 1.1.4 pom @@ -46,13 +46,25 @@ - jscl-meditor - jscl-meditor - 2.3.5 + org.solovyev + jscl + 0.0.1 + system ${additionalLibs}/jscl.jar + + commons-lang + commons-lang + 2.2 + + org.simpleframework simple-xml diff --git a/src/main/java/org/solovyev/android/calculator/math/Factorial.java b/src/main/java/org/solovyev/android/calculator/math/Factorial.java deleted file mode 100644 index 15f35452..00000000 --- a/src/main/java/org/solovyev/android/calculator/math/Factorial.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright (c) 2009-2011. Created by serso aka se.solovyev. - * For more information, please, contact se.solovyev@gmail.com - * or visit http://se.solovyev.org - */ - -package org.solovyev.android.calculator.math; - -import jscl.math.Generic; -import jscl.math.NotIntegrableException; -import jscl.math.Variable; -import jscl.math.function.Function; - -/** - * User: serso - * Date: 9/26/11 - * Time: 12:58 PM - */ -public class Factorial extends Function { - - public Factorial(Generic[] parameter) { - super("fact", parameter); - } - - @Override - public Generic evaluate() { - return expressionValue(); - } - - @Override - public Generic evalelem() { - return null; - } - - @Override - public Generic evalsimp() { - return null; - } - - @Override - public Generic evalnum() { - return null; - } - - @Override - public Generic antiderivative(int n) throws NotIntegrableException { - throw new UnsupportedOperationException("Not implemented yet!"); - } - - @Override - public Generic derivative(int n) { - throw new UnsupportedOperationException("Not implemented yet!"); - } - - @Override - protected Variable newinstance() { - return new Factorial(null); - } -}