diff --git a/src/net/apocalypselabs/symat/Help.java b/src/net/apocalypselabs/symat/Help.java index 5079ace..597e111 100644 --- a/src/net/apocalypselabs/symat/Help.java +++ b/src/net/apocalypselabs/symat/Help.java @@ -241,17 +241,9 @@ public class Help extends javax.swing.JInternalFrame { + "

" + "

SyMAT is copyright © " + Calendar.getInstance().get(Calendar.YEAR) - + " Apocalypse Laboratories. Some rights reserved." - + "

" - + "

Internal help documentation is " - + "licensed under the Creative Commons " - + "Attribution-NonCommercial 4.0 International" - + " license (CC-BY-NC). " - + "You can use it in part or in whole " - + "for any purpose, excepting commercial, as long as " - + "you attribute Apocalypse Laboratories. See " - + "http://creativecommons.org/licenses/by-nc/4.0/" - + " for more information.

"; + + " Apocalypse Laboratories." + + "
" + + "This built-in documentation falls under the SyMAT Media License.

"; setText(text, "Manual"); } else { try { diff --git a/src/net/apocalypselabs/symat/functions.py b/src/net/apocalypselabs/symat/functions.py index 3f81a51..d179cf5 100644 --- a/src/net/apocalypselabs/symat/functions.py +++ b/src/net/apocalypselabs/symat/functions.py @@ -60,3 +60,7 @@ def sleep(x): _.sleep(x) def pause(x): _.pause(x) +def perms(*a): + return _.perms(a) +def md5sum(a): + return _.md5sum(a) \ No newline at end of file diff --git a/src/net/apocalypselabs/symat/help/commands.html b/src/net/apocalypselabs/symat/help/commands.html index cf4da9d..8c2917d 100644 --- a/src/net/apocalypselabs/symat/help/commands.html +++ b/src/net/apocalypselabs/symat/help/commands.html @@ -3,7 +3,7 @@ Commands -

Command Reference

+

Basic Command Reference

notify(var) Creates a popup box with the given content.
ask(prompt) Returns the entered text. @@ -11,7 +11,6 @@
diff("x^3", "x") Returns the derivative of the function with respect to the second argument.
integrate("3*x^2", "x") Returns the integral of the function with respect to the second argument.
$("command") Parses the given text with the Symja library. -
   Aliases: sym
simplify("expr") Simplifies the given expression.
vpa("expr") Attempts to find the numerical value of "expr".
replace("text", "find", "replace") Returns "text" with all occurrences of "find" changed to "replace". @@ -19,18 +18,30 @@ Returns the answer or 0.0 if there is no numerical answer.
plot("function") Graphs the given function as if it were typed into a graph window. Uses the graph window bound to the current action. -
   Aliases: ezplot, graph
plotname("name") Set the window title of the bound graph window.
plotname() Get the name of the plot window.
plotclr() Clears all drawings from the plot window. -
   Aliases: clearplot, plotclear
plotscale({-1,0,1,2,3}) Scale the graph. Erases content when scaled. Smaller is farther out, larger closer.
drawDot(x,y) Draw a small red dot wherever you tell it.
rad(degrees), deg(radians) Convert degrees to radians and vice versa. Python has built-in radians(degrees) and degrees(radians) which work the same. -
-
+
pause(1000) Pause script execution for a number of milliseconds. +
factorial(n) Calculate (n!). +
factor(n) Get an array (list) of all the factors of n. +
add(n1,n2,n3...)|add(n[]) Add together the given numbers or array of numbers. +
subtract(n1,n2,n3...)|subtract(n[]) Subtract the given numbers or array of numbers, as in (n1-n2-n3-...) +
times(n1,n2,n3...)|times(n[]) Multiply together the given numbers or array of numbers. +
divide(n1,n2,n3...)|divide(n[]) Divide the given numbers or array of numbers, as in (n1/n2/n3/...) +
perms(a,b,c...)|perms(items[]) Get an array of all possible combinations of the given items. +
rand() Get a random fraction between 0 and 1. +
randb() Get a random boolean (true or false). +
rand(min,max) Get a random integer between min and max, inclusive. +
readfile(path) Read the text file at path and return the contents. +
savefile(content,path) Save the content in the file at path. +

+

+ For more information, consult the Wiki or SyMAT's source code.

diff --git a/src/net/apocalypselabs/symat/resources/jsfunctions.txt b/src/net/apocalypselabs/symat/resources/jsfunctions.txt index eb691d4..44f3003 100644 --- a/src/net/apocalypselabs/symat/resources/jsfunctions.txt +++ b/src/net/apocalypselabs/symat/resources/jsfunctions.txt @@ -19,11 +19,14 @@ savefile(data,"")|Save the text data to a file. rand()|Random fraction from 0 (inclusive) to 1 (exclusive) rand(min,max)|Random number between min and max, inclusive randb()|Random boolean (true or false) +perms(items)|Array of all possible combinations. add(n1,n2,...)|Add the given numbers. subtract(n1,n2,...)|Subtract the given numbers. times(n1,n2,...)|Multiply the given numbers. divide(n1,n2,...)|Divide the given numbers. mod(n1,n2,...)|Divide the numbers and return the remainder. +factorial(n)|Get the factorial (n!) of n as a string. +factor(n)|Get an array of all the factors of n. abs(0)|Absolute value of number. asin(0)| acos(0)| diff --git a/src/net/apocalypselabs/symat/resources/pyfunctions.txt b/src/net/apocalypselabs/symat/resources/pyfunctions.txt index e7784f1..e0e9ba1 100644 --- a/src/net/apocalypselabs/symat/resources/pyfunctions.txt +++ b/src/net/apocalypselabs/symat/resources/pyfunctions.txt @@ -24,6 +24,9 @@ times(n1,n2,...)|Multiply the given numbers. divide(n1,n2,...)|Divide the given numbers. mod(n1,n2,...)|Divide the numbers and return the remainder. vpa('')|Computes numerical value or simplifies. +factorial(n)|Get the factorial (n!) of n as a string. +factor(n)|Get an array of all the factors of n. +perms(items)|Array of all possible combinations. fabs(0)|Absolute value of number. asin(0)| acos(0)|