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

Add aliases to Python so "_." prefix no longer needed, update documentation

Browse Source
This commit is contained in:
skylarmt 2015-01-30 15:35:28 -07:00
parent a9575e64e4
commit f81db07bf1
9 changed files with 49 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/net/apocalypselabs/symat/CodeRunner.java
View File

@ -193,7 +193,7 @@ public class CodeRunner {
.getResourceAsStream("functions."+lang))); .getResourceAsStream("functions."+lang)));
String line; String line;
while ((line = reader.readLine()) != null) { while ((line = reader.readLine()) != null) {
text += line; text += line+"\n";
} }
} catch (Exception e) { } catch (Exception e) {
} }

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

@ -243,6 +243,16 @@ public class Functions {
return item; return item;
} }
// Fix for Python reserved word "global"
public static void setglobal(String name, Object var) {
global(name, var);
}
// Fix for Python reserved word "global"
public static void getglobal(String name) {
global(name);
}
/** /**
* Clear all the GLOBALS. * Clear all the GLOBALS.
*/ */

2
src/net/apocalypselabs/symat/SplashScreen.form
View File

@ -80,7 +80,7 @@
</Property> </Property>
<Property name="horizontalAlignment" type="int" value="11"/> <Property name="horizontalAlignment" type="int" value="11"/>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.form.RADConnectionPropertyEditor"> <Property name="text" type="java.lang.String" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
<Connection code="&quot;Version &quot;+MainGUI.VERSION_NAME" type="code"/> <Connection code="&quot;&lt;html&gt;&lt;b&gt;Version &quot;+MainGUI.VERSION_NAME+&quot;&lt;/b&gt;&quot;" type="code"/>
</Property> </Property>
<Property name="verticalAlignment" type="int" value="1"/> <Property name="verticalAlignment" type="int" value="1"/>
</Properties> </Properties>

2
src/net/apocalypselabs/symat/SplashScreen.java
View File

@ -111,7 +111,7 @@ public class SplashScreen extends javax.swing.JFrame {
jLabel1.setFont(MainGUI.ubuntuRegular.deriveFont(18.0F)); jLabel1.setFont(MainGUI.ubuntuRegular.deriveFont(18.0F));
jLabel1.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING); jLabel1.setHorizontalAlignment(javax.swing.SwingConstants.TRAILING);
jLabel1.setText("Version "+MainGUI.VERSION_NAME); jLabel1.setText("<html><b>Version "+MainGUI.VERSION_NAME+"</b>");
jLabel1.setVerticalAlignment(javax.swing.SwingConstants.TOP); jLabel1.setVerticalAlignment(javax.swing.SwingConstants.TOP);
jLayeredPane1.add(jLabel1); jLayeredPane1.add(jLabel1);
jLabel1.setBounds(200, 110, 130, 30); jLabel1.setBounds(200, 110, 130, 30);

24
src/net/apocalypselabs/symat/functions.py
View File

@ -1,42 +1,36 @@
'''def notify(msg): def notify(msg):
_.notify(msg) _.notify(msg)
def ask(msg): def ask(msg):
return _.ask(msg) return _.ask(msg)
def diff(fun,var): def diff(fun,var):
return _.diff(fun,var) return _.diff(fun,var)
def integrate(fun,var): def integrate(fun,var):
return _.integrate(fun,var) return _.integrate(fun,var)
def rad(num): def rad(num):
return _.rad(num) return _.rad(num)
def deg(num): def deg(num):
return _.deg(num) return _.deg(num)
def subs(fun,var): def subs(fun,var):
return _.subs(fun,var) return _.subs(fun,var)
def plot(): def plot():
_.plot() _.plot()
def plot(fun): def plot(fun):
_.plot(fun) _.plot(fun)
def plotname(fun): def plotname(fun):
_.plotname(fun) _.plotname(fun)
def plotname(): def plotname():
return _.plotname() return _.plotname()
def xlim(min,max): def xlim(min,max):
_.xlim(min,max) _.xlim(min,max)
def plotclr(): def plotclr():
_.plotclr() _.plotclr()
def drawdot(x, y): def drawdot(x, y):
_.drawdot(x, y) _.drawdot(x, y)
''' def simplify(expr):
return _.simplify(expr)
def vpa(expr):
return _.vpa(expr)
def setglobal(key,val):
_.setglobal(key,val)
def getglobal(key):
return _.getglobal(key)

4
src/net/apocalypselabs/symat/help/commands.html
View File

@ -12,6 +12,10 @@
<br><b>integrate("3*x^2", "x")</b> Returns the integral of the function with respect to the second argument. <br><b>integrate("3*x^2", "x")</b> Returns the integral of the function with respect to the second argument.
<br><b>$("command")</b> Parses the given text with the Symja library. <br><b>$("command")</b> Parses the given text with the Symja library.
<br>&nbsp;&nbsp;&nbsp;<i>Aliases: sym</i> <br>&nbsp;&nbsp;&nbsp;<i>Aliases: sym</i>
<br><b>simplify("expr")</b> Simplifies the given expression.
<br><b>vpa("expr")</b> Attempts to find the numerical value of "expr".
<br><b>global("name",value)</b> Sets global variable "name" to value.
<br><b>global("name")</b> Gets the global variable with id "name".
<br><b>replace("text", "find", "replace")</b> Returns "text" with all occurrences of "find" changed to "replace". <br><b>replace("text", "find", "replace")</b> Returns "text" with all occurrences of "find" changed to "replace".
<br><b>subs("function", "var", "replace")</b> Replaces all occurrences of "var" with "replace" and solves. <br><b>subs("function", "var", "replace")</b> Replaces all occurrences of "var" with "replace" and solves.
Returns the answer or 0.0 if there is no numerical answer. Returns the answer or 0.0 if there is no numerical answer.

6
src/net/apocalypselabs/symat/help/editor.html
View File

@ -6,12 +6,8 @@
<h1>Code Editor</h1> <h1>Code Editor</h1>
<p>The code editor allows you to make scripts that can do many things. <p>The code editor allows you to make scripts that can do many things.
<br>Scripts can be written in JavaScript or in Python. <br>Scripts can be written in JavaScript or in Python.
<br>To switch languages, use the Language option on the Edit menu. <br>To switch languages, use the Language option on the Run menu.
</p> </p>
<p><i><b>Note:</b>
Python scripts require
<span style="font-family: monospace;">_.</span>
before SyMAT commands.</i></p>
<h2>Exporting Code</h2> <h2>Exporting Code</h2>
<p>You can export syntax-highlighted (colored) code to <p>You can export syntax-highlighted (colored) code to
HTML or PDF with the Export tool. This is useful for generating HTML or PDF with the Export tool. This is useful for generating

4
src/net/apocalypselabs/symat/resources/jsfunctions.txt
View File

@ -5,6 +5,10 @@ integrate('',"x")|Find the integral of the function passed with respect to the s
rad(0)|Convert a given number in degrees to radians. rad(0)|Convert a given number in degrees to radians.
deg(0)|Convert a given number in radians to degrees. deg(0)|Convert a given number in radians to degrees.
subs('',"x")|Solve an equation for the second argument. subs('',"x")|Solve an equation for the second argument.
simplify('')|Simplify the given function.
vpa('')|Computes numerical value or simplifies.
setglobal("", obj)|Set global variable with the given id.
getglobal("")|Get global variable with the given id.
plot()|Show the plot window. plot()|Show the plot window.
plot('')|Graph the given function. plot('')|Graph the given function.
plotname("")|Sets the title of the graph window. plotname("")|Sets the title of the graph window.

32
src/net/apocalypselabs/symat/resources/pyfunctions.txt
View File

@ -1,17 +1,21 @@
_.notify("")|Display a message in a box. notify("")|Display a message in a box.
_.ask("")|Ask a question in a box. Supply question text. ask("")|Ask a question in a box. Supply question text.
_.diff('',"x")|Find the derivative of the function passed with respect to the second argument. diff('',"x")|Find the derivative of the function passed with respect to the second argument.
_.integrate('',"x")|Find the integral of the function passed with respect to the second argument. integrate('',"x")|Find the integral of the function passed with respect to the second argument.
_.rad(0)|Convert a given number in degrees to radians. rad(0)|Convert a given number in degrees to radians.
_.deg(0)|Convert a given number in radians to degrees. deg(0)|Convert a given number in radians to degrees.
_.subs('',"x")|Solve an equation for the second argument. subs('',"x")|Solve an equation for the second argument.
_.plot()|Show the plot window. plot()|Show the plot window.
_.plot('')|Graph the given function. plot('')|Graph the given function.
_.plotname("")|Sets the title of the graph window. plotname("")|Sets the title of the graph window.
_.plotname()|Gets the title of the graph window. plotname()|Gets the title of the graph window.
_.xlim(min,max)|Sets the x-axis min and max values. Cannot be used after a formula has been graphed. xlim(min,max)|Sets the x-axis min and max values. Cannot be used after a formula has been graphed.
_.plotclr()|Reset the graph. plotclr()|Reset the graph.
_.drawdot(x, y)|Places a dot at the given coordinates. drawdot(x, y)|Places a dot at the given coordinates.
simplify('')|Simplify the given function.
vpa('')|Computes numerical value or simplifies.
global("", obj)|Set global variable with the given id.
global("")|Get global variable with the given id.
fabs(0)|Absolute value of number. fabs(0)|Absolute value of number.
asin(0)| asin(0)|
acos(0)| acos(0)|