Use EvalEngine#evalNumericFunction()

Author: axkr

symja_android_library/matheclipse-core/src/main/java/org/matheclipse/core/builtin/Arithmetic.java

@@ -314,7 +314,7 @@ public IExpr evaluateArg1(final IExpr arg1, EvalEngine engine) {
         return ((INumber) arg1).abs();
       }
       if (arg1.isNumericFunction(true)) {
-        IExpr temp = engine.evalN(arg1);
+        IExpr temp = engine.evalNumericFunction(arg1);
         if (temp.isReal()) {
           return arg1.copySign((IReal) temp);
         }
@@ -6360,7 +6360,7 @@ public IExpr e2ObjArg(IAST ast, final IExpr arg1, final IExpr arg2) {
 
         switch (arg2Ordinal) {
           case ID.Plus:
-            if (arg1.isFraction() && arg1.isNegative() && arg2.isPlus()) {
+            if (arg1.isFraction() && arg2.isPlus() && arg1.isNegative()) {
               return F.Times(arg1.negate(), arg2.negate());
             }
             break;
@@ -6375,7 +6375,7 @@ public IExpr e2ObjArg(IAST ast, final IExpr arg1, final IExpr arg2) {
             }
             break;
           case ID.Log:
-            if (arg1.isNegative() && arg2.isLog() && arg2.first().isFraction() && arg1.isReal()) {
+            if (arg1.isReal() && arg2.isLog() && arg1.isNegative() && arg2.first().isFraction()) {
               IFraction f = (IFraction) arg2.first();
               if (f.isPositive() && f.isLT(F.C1)) {
                 // -<number> * Log(<fraction>) -> <number> * Log(<fraction>.inverse())

symja_android_library/matheclipse-core/src/main/java/org/matheclipse/core/generic/BinaryNumerical.java

@@ -48,9 +48,10 @@ public BinaryNumerical(final IExpr fn, final ISymbol v1, final ISymbol v2,
   @Override
   public IExpr apply(final IExpr firstArg, final IExpr secondArg) {
     return fEngine
-        .evalN(F.subst(fun, F.list(F.Rule(variable1, firstArg), F.Rule(variable2, secondArg))));
+        .evalNumericFunction(F.subst(fun, F.list(F.Rule(variable1, firstArg), F.Rule(variable2, secondArg))));
   }
 
+  @Override
   public double value(final double x, final double y) {
     double result = 0.0;
     try {

symja_android_library/matheclipse-core/src/main/java/org/matheclipse/core/generic/UnaryCompiled.java

@@ -113,7 +113,7 @@ public IExpr apply(final IExpr value) {
    */
   public IExpr applyLimit(IExpr value) {
     try {
-      return fEngine.evalN(F.Limit(fUnaryFunction, F.Rule(fVariable, value)));
+      return fEngine.evalNumericFunction(F.Limit(fUnaryFunction, F.Rule(fVariable, value)));
     } catch (RuntimeException rex) {
       return S.Indeterminate;
     }
@@ -128,7 +128,7 @@ public IExpr applyLimit(IExpr value) {
   @Override
   public IExpr apply(double value) {
     try {
-      return fEngine.evalN(F.subst(fUnaryFunction, F.Rule(fVariable, F.num(value))));
+      return fEngine.evalNumericFunction(F.subst(fUnaryFunction, F.Rule(fVariable, F.num(value))));
     } catch (RuntimeException rex) {
       return S.Indeterminate;
     }

symja_android_library/matheclipse-core/src/main/java/org/matheclipse/core/generic/UnaryNumerical.java

@@ -90,7 +90,7 @@ public UnaryNumerical(final IExpr unaryFunction, final ISymbol variable, final E
 
   @Override
   public IExpr apply(final IExpr value) {
-    return fEngine.evalN(F.subst(fUnaryFunction, F.Rule(fVariable, value)));
+    return fEngine.evalNumericFunction(F.subst(fUnaryFunction, F.Rule(fVariable, value)));
   }
 
   /**
@@ -102,7 +102,7 @@ public IExpr apply(final IExpr value) {
    */
   public IExpr applyLimit(IExpr value) {
     try {
-      return fEngine.evalN(F.Limit(fUnaryFunction, F.Rule(fVariable, value)));
+      return fEngine.evalNumericFunction(F.Limit(fUnaryFunction, F.Rule(fVariable, value)));
     } catch (RuntimeException rex) {
       return S.Indeterminate;
     }
@@ -117,7 +117,7 @@ public IExpr applyLimit(IExpr value) {
   @Override
   public IExpr apply(double value) {
     try {
-      return fEngine.evalN(F.subst(fUnaryFunction, F.Rule(fVariable, F.num(value))));
+      return fEngine.evalNumericFunction(F.subst(fUnaryFunction, F.Rule(fVariable, F.num(value))));
     } catch (RuntimeException rex) {
       return S.Indeterminate;
     }

symja_android_library/matheclipse-core/src/main/java/org/matheclipse/core/graphics/Show3D2ThreeJS.java

@@ -40,7 +40,7 @@ public class Show3D2ThreeJS {
   @Deprecated
   private static void graphics3dToSVG(IAST ast, StringBuilder buf) {
     EvalEngine engine = EvalEngine.get();
-    IAST numericAST = (IAST) engine.evalN(ast);
+    IAST numericAST = (IAST) engine.evalNumericFunction(ast);
     double[] viewpoints = new double[] {1.3, -2.4, 2.0};
     if (numericAST.size() > 2) {
       final OptionArgs options = new OptionArgs(numericAST.topHead(), numericAST, 2, engine);

symja_android_library/matheclipse-core/src/main/java/org/matheclipse/core/interfaces/IExpr.java

@@ -1216,16 +1216,16 @@ default IExpr.COMPARE_TERNARY equalTernary(IExpr that, EvalEngine engine) {
     IExpr arg1 = this;
     IExpr arg2 = that;
     if (!arg1.isReal() && arg1.isNumericFunction(x -> x.isDirectedInfinity() ? "" : null)) {
-      arg1 = engine.evalN(arg1);
+      arg1 = engine.evalNumericFunction(arg1);
     }
     if (!arg2.isReal() && arg2.isNumericFunction(x -> x.isDirectedInfinity() ? "" : null)) {
-      arg2 = engine.evalN(arg2);
+      arg2 = engine.evalNumericFunction(arg2);
     }
     if (arg2.isInexactNumber() && arg1.isExactNumber()) {
-      arg1 = engine.evalN(arg1);
+      arg1 = engine.evalNumericFunction(arg1);
     }
     if (arg1.isInexactNumber() && arg2.isExactNumber()) {
-      arg2 = engine.evalN(arg2);
+      arg2 = engine.evalNumericFunction(arg2);
     }
 
     if (isSame(that)) {
@@ -1443,7 +1443,7 @@ default IExpr evalNIL(EvalEngine engine) {
    */
   default INumber evalNumber() {
     if (isNumber()) {
-      IExpr result = EvalEngine.get().evalN(this);
+      IExpr result = EvalEngine.get().evalNumericFunction(this);
       if (result.isNumber()) {
         return (INumber) result;
       }