Change F.symjify() method - evaluate after parsing by default

Author: axkr

symja_android_library/matheclipse-core/src/main/java/org/matheclipse/core/expression/F.java

@@ -4395,7 +4395,7 @@ public static IAST Symmetric(final IExpr a0) {
 	}
 
 	/**
-	 * Converts an arbitrary expression to a type that can be used inside Symja.
+	 * Converts and evaluates arbitrary expressiona to a Symja type.
 	 * 
 	 * <pre>
 	 * Java Object       -&gt; Symja object
@@ -4423,20 +4423,41 @@ public static IAST Symmetric(final IExpr a0) {
 	 * 
 	 */
 	public static IExpr symjify(final Object object) {
-		return Object2Expr.convert(object);
+		return symjify(object, true);
+	}
+
+	public static IExpr symjify(final Object object, boolean evaluate) {
+		IExpr temp = Object2Expr.convert(object);
+		return evaluate ? eval(temp) : temp;
+	}
+
+	/**
+	 * Parses and evaluates a Java string to a Symja expression. May throw an SyntaxError exception, if the string couldn't be parsed.
+	 * 
+	 * @param str
+	 *            the epression which should be parsed
+	 * @return
+	 * @throws SyntaxError
+	 */
+	public static IExpr symjify(final String str) throws SyntaxError { 
+		return symjify(str, true);
 	}
 
 	/**
 	 * Parses a Java string to a Symja expression. May throw an SyntaxError exception, if the string couldn't be parsed.
 	 * 
 	 * @param str
 	 *            the epression which should be parsed
+	 * @param evaluate
+	 *            if true evaluate the parsed string
 	 * @return
 	 * @throws SyntaxError
 	 */
-	public static IExpr symjify(final String str) throws SyntaxError {
-		ExprParser parser = new ExprParser(EvalEngine.get());
-		return parser.parse(str);
+	public static IExpr symjify(final String str, boolean evaluate) throws SyntaxError {
+		EvalEngine engine = EvalEngine.get();
+		ExprParser parser = new ExprParser(engine);
+		IExpr temp = parser.parse(str);
+		return evaluate ? engine.evaluate(temp) : temp;
 	}
 
 	public static IExpr symjify(final long value) {

symja_android_library/matheclipse-core/src/test/java/org/matheclipse/core/system/SymjifyTestCase.java

@@ -4,7 +4,7 @@
 import org.matheclipse.core.interfaces.IExpr;
 
 /**
- * 
+ * Test F.symjify()
  */
 public class SymjifyTestCase extends AbstractTestCase {
 	public SymjifyTestCase(String name) {
@@ -13,7 +13,7 @@ public SymjifyTestCase(String name) {
 
 	public void test001() {
 		IExpr expr = F.symjify("(a+(b+c))");
-		assertEquals(expr.fullFormString(), "Plus(a, Plus(b, c))");
+		assertEquals(expr.fullFormString(), "Plus(a, b, c)");
 		assertEquals(expr.toString(), "a+b+c");
 	}