Netsyms/SyMAT
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Mess around with math functions, change version to 0.8

Browse Source
This commit is contained in:
skylarmt 2014-12-22 03:01:09 -07:00
parent 422b4bbbe7
commit 2611cf020a
2 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/net/apocalypselabs/symat/Functions.java
View File

@ -27,6 +27,8 @@
*/
package net.apocalypselabs.symat;
import javax.script.ScriptEngine;
import javax.script.ScriptEngineManager;
import javax.swing.JOptionPane;
import org.matheclipse.core.eval.EvalUtilities;
import org.matheclipse.parser.client.math.MathException;
@ -40,7 +42,8 @@ import org.matheclipse.parser.client.math.MathException;
*/
public class Functions {
EvalUtilities util = new EvalUtilities(false, true);
private ScriptEngine symja = new ScriptEngineManager().getEngineByExtension("m");
private EvalUtilities util = new EvalUtilities(true, true);
Graph graphwin = new Graph(true);
/*
@ -57,10 +60,28 @@ public class Functions {
/*
Math commands
*/
// Derivative of function with respect to idv
public String D(String function, String idv) {
return util.evaluate("diff(" + function + "," + idv + ")").toString();
}
public double cos(Object expression) {
return Double.parseDouble(util.evaluate("Cos("+expression+")").toString());
}
public double sin(Object expression) {
return Double.parseDouble(util.evaluate("Sin("+expression+")").toString());
}
public double tan(Object expression) {
return Double.parseDouble(util.evaluate("Tan("+expression+")").toString());
}
public String factor(String function) {
return sym("Factor(" + function + ")");
}
public String sym(String input) {
return util.evaluate(input).toString();
}

6
src/net/apocalypselabs/symat/MainGUI.java
View File

@ -44,9 +44,9 @@ import javax.swing.JInternalFrame;
*/
public class MainGUI extends javax.swing.JFrame {
public static final String APP_NAME = "SyMAT 0.7";
public static final double APP_CODE = 7;
public static final String VERSION_NAME = "0.7";
public static final String APP_NAME = "SyMAT 0.8";
public static final double APP_CODE = 8;
public static final String VERSION_NAME = "0.8";
public static String argfile = "";
public static boolean skipPython = false; // Skip python init on start?