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

Memory

Browse Source
This commit is contained in:
serso
2016-03-09 21:29:16 +01:00
parent 3dabe37576
commit 84be914bd5
10 changed files with 327 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
jscl/src/main/java/jscl/math/Expression.java
View File

@@ -128,12 +128,11 @@ public class Expression extends Generic {
return new Expression().init(generic);
}
public static Expression init(@Nonnull NumericWrapper numericWrapper) {
final Expression expression = new Expression(1);
Literal literal = new Literal();
public Expression init(@Nonnull NumericWrapper numericWrapper) {
final Literal literal = new Literal();
literal.init(new ExpressionVariable(numericWrapper), 1);
expression.init(literal, JsclInteger.ONE);
return expression;
init(literal, JsclInteger.ONE);
return this;
}
public static void separateSign(MathML element, Generic generic) {
@@ -561,21 +560,13 @@ public class Expression extends Generic {
try {
return integerValue().numeric();
} catch (NotIntegerException ex) {
final Literal literal = literalScm();
final Map<Variable, Generic> content = literal.content(NUMERIC_CONVERTER);
return substitute(content);
return substitute(literalScm().content(NUMERIC_CONVERTER));
}
}
@Nonnull
public Generic valueOf(@Nonnull Generic generic) {
final Expression result = newInstance(0);
result.init(generic);
return result;
return newInstance(0).init(generic);
}
@Nonnull