mathlib-commitlog Mailing List for JMathLib - Octave, Matlab clone in java (Page 7)
Status: Beta
Brought to you by:
st_mueller
Menu
▾
▴
mathlib-commitlog — log of all commits to CVS
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(2) |
Jul
(4) |
Aug
(150) |
Sep
|
Oct
|
Nov
|
Dec
(2) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(233) |
Feb
(86) |
Mar
(32) |
Apr
(26) |
May
(73) |
Jun
(45) |
Jul
(23) |
Aug
(23) |
Sep
(5) |
Oct
(80) |
Nov
(11) |
Dec
(11) |
| 2008 |
Jan
|
Feb
|
Mar
(13) |
Apr
(3) |
May
(7) |
Jun
(30) |
Jul
(12) |
Aug
(12) |
Sep
|
Oct
|
Nov
(78) |
Dec
(78) |
| 2009 |
Jan
(214) |
Feb
(79) |
Mar
(20) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <st_...@us...> - 2009-01-24 19:45:34
|
Revision: 760
http://mathlib.svn.sourceforge.net/mathlib/?rev=760&view=rev
Author: st_mueller
Date: 2009-01-24 19:45:28 +0000 (Sat, 24 Jan 2009)
Log Message:
-----------
changed signature of evaluate(Token[] operands)
to
evaluate(Token[] operands, GlobalValues globals)
Modified Paths:
--------------
JMathLib/trunk/src/jmathlib/core/tokens/LogicalToken.java
Modified: JMathLib/trunk/src/jmathlib/core/tokens/LogicalToken.java
===================================================================
--- JMathLib/trunk/src/jmathlib/core/tokens/LogicalToken.java 2009-01-24 19:43:23 UTC (rev 759)
+++ JMathLib/trunk/src/jmathlib/core/tokens/LogicalToken.java 2009-01-24 19:45:28 UTC (rev 760)
@@ -2,11 +2,13 @@
import jmathlib.core.interpreter.ErrorLogger;
import jmathlib.core.interpreter.Errors;
+import jmathlib.core.interpreter.GlobalValues;
import jmathlib.core.tokens.numbertokens.DoubleNumberToken;
public class LogicalToken extends DataToken
{
+ /** data */
private boolean values[];
@@ -89,9 +91,7 @@
}
}
-
/**
- *
* @param _dy
* @param _dx
* @param _reValues
@@ -418,6 +418,11 @@
return result;
}
+ /**
+ * @param dim
+ * @param i
+ * @return
+ */
private String toString(int[] dim, int i)
{
String ret="";
@@ -454,6 +459,11 @@
return ret;
}
+ /**
+ *
+ * @param nn
+ * @return
+ */
private String toString2d(int[] nn)
{
StringBuffer buffer = new StringBuffer(20);
@@ -480,7 +490,7 @@
/**Evaluate the token. This causes it to return itself*/
- public OperandToken evaluate(Token[] operands)
+ public OperandToken evaluate(Token[] operands, GlobalValues globals)
{
return this;
}
@@ -601,7 +611,9 @@
}
- /**@return true if this number token is a scalar (1*1 matrix)*/
+ /**
+ * @return true if this number token is a scalar (1*1 matrix)
+ */
public boolean isScalar()
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <st_...@us...> - 2009-01-24 19:43:28
|
Revision: 759
http://mathlib.svn.sourceforge.net/mathlib/?rev=759&view=rev
Author: st_mueller
Date: 2009-01-24 19:43:23 +0000 (Sat, 24 Jan 2009)
Log Message:
-----------
changed signature of evaluate(Token[] operands)
to
evaluate(Token[] operands, GlobalValues globals)
Modified Paths:
--------------
JMathLib/trunk/src/jmathlib/core/tokens/MulDivOperatorToken.java
Modified: JMathLib/trunk/src/jmathlib/core/tokens/MulDivOperatorToken.java
===================================================================
--- JMathLib/trunk/src/jmathlib/core/tokens/MulDivOperatorToken.java 2009-01-24 19:42:32 UTC (rev 758)
+++ JMathLib/trunk/src/jmathlib/core/tokens/MulDivOperatorToken.java 2009-01-24 19:43:23 UTC (rev 759)
@@ -7,13 +7,10 @@
/**Class representing multiplicaton and division operations within an expression*/
public class MulDivOperatorToken extends BinaryOperatorToken
{
- /**constant values*/
- //static public final MulDivOperatorToken divide = new MulDivOperatorToken('/');
- //static public final MulDivOperatorToken multiply = new MulDivOperatorToken('*');
-
/**Constructor taking the operator and priority
- @param _operator = the actual operator */
+ * @param _operator = the actual operator
+ */
public MulDivOperatorToken (char _operator)
{
/**call the super constructor, type defaults to ttoperator and operands to 2*/
@@ -23,7 +20,7 @@
/**evaluate the operator
@param operands = the operators operands
@return the result as an OperandToken*/
- public OperandToken evaluate(Token[] operands)
+ public OperandToken evaluate(Token[] operands, GlobalValues globals)
{
OperandToken result = null;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <st_...@us...> - 2009-01-24 19:42:36
|
Revision: 758
http://mathlib.svn.sourceforge.net/mathlib/?rev=758&view=rev
Author: st_mueller
Date: 2009-01-24 19:42:32 +0000 (Sat, 24 Jan 2009)
Log Message:
-----------
changed signature of evaluate(Token[] operands)
to
evaluate(Token[] operands, GlobalValues globals)
Modified Paths:
--------------
JMathLib/trunk/src/jmathlib/core/tokens/AddSubOperatorToken.java
Modified: JMathLib/trunk/src/jmathlib/core/tokens/AddSubOperatorToken.java
===================================================================
--- JMathLib/trunk/src/jmathlib/core/tokens/AddSubOperatorToken.java 2009-01-24 19:41:02 UTC (rev 757)
+++ JMathLib/trunk/src/jmathlib/core/tokens/AddSubOperatorToken.java 2009-01-24 19:42:32 UTC (rev 758)
@@ -1,16 +1,15 @@
package jmathlib.core.tokens;
+import jmathlib.core.interpreter.GlobalValues;
import jmathlib.core.tokens.numbertokens.DoubleNumberToken;
/**Used to implement addition and subtraction operations within an expression*/
public class AddSubOperatorToken extends BinaryOperatorToken
{
- /**constant values*/
- //static public final AddSubOperatorToken add = new AddSubOperatorToken('+');
- //static public final AddSubOperatorToken subtract = new AddSubOperatorToken('-');
/**Constructor taking the operator and priority
- @param _operator = the actual operator */
+ * @param _operator = the actual operator
+ */
public AddSubOperatorToken (char _operator)
{
/**call the super constructor, type defaults to ttoperator and operands to 2*/
@@ -18,9 +17,11 @@
}
/**evaluates the operator
- @param operands = the operators operands
- @return the result of the operation as an OperandToken*/
- public OperandToken evaluate(Token[] operands)
+ * @param operands = the operators operands
+ * @param globals
+ * @return the result of the operation as an OperandToken
+ */
+ public OperandToken evaluate(Token[] operands, GlobalValues globals)
{
OperandToken result = null;
@@ -51,6 +52,5 @@
return result;
}
-
-
+
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <st_...@us...> - 2009-01-24 19:41:08
|
Revision: 757
http://mathlib.svn.sourceforge.net/mathlib/?rev=757&view=rev
Author: st_mueller
Date: 2009-01-24 19:41:02 +0000 (Sat, 24 Jan 2009)
Log Message:
-----------
changed signature of evaluate(Token[] operands)
to
evaluate(Token[] operands, GlobalValues globals)
Modified Paths:
--------------
JMathLib/trunk/src/jmathlib/core/functions/ExternalFunctionClassLoader.java
JMathLib/trunk/src/jmathlib/core/functions/FileFunctionLoader.java
JMathLib/trunk/src/jmathlib/core/functions/FunctionPathBroker.java
JMathLib/trunk/src/jmathlib/core/functions/ReflectionFunctionCall.java
Modified: JMathLib/trunk/src/jmathlib/core/functions/ExternalFunctionClassLoader.java
===================================================================
--- JMathLib/trunk/src/jmathlib/core/functions/ExternalFunctionClassLoader.java 2009-01-24 19:40:48 UTC (rev 756)
+++ JMathLib/trunk/src/jmathlib/core/functions/ExternalFunctionClassLoader.java 2009-01-24 19:41:02 UTC (rev 757)
@@ -79,7 +79,7 @@
ErrorLogger.debugLine("ext func loader: NOTFOUND");
return null;
}
- else if (!classFile.getName().toLowerCase().endsWith(".class")){
+ else if (!classFile.getName().endsWith(".class")){
ErrorLogger.debugLine("ext func loader: Non-class file attempted load");
return null;
}else
Modified: JMathLib/trunk/src/jmathlib/core/functions/FileFunctionLoader.java
===================================================================
--- JMathLib/trunk/src/jmathlib/core/functions/FileFunctionLoader.java 2009-01-24 19:40:48 UTC (rev 756)
+++ JMathLib/trunk/src/jmathlib/core/functions/FileFunctionLoader.java 2009-01-24 19:41:02 UTC (rev 757)
@@ -85,7 +85,7 @@
protected Function parseFunctionFile(File functionFile, String functionName) {
Function func = null;
- String fileName = functionFile.getName().toLowerCase();
+ String fileName = functionFile.getName();
if (fileName.endsWith(".m"))
{
func = mLoader.loadMFile(functionFile.getParent(), functionName);
Modified: JMathLib/trunk/src/jmathlib/core/functions/FunctionPathBroker.java
===================================================================
--- JMathLib/trunk/src/jmathlib/core/functions/FunctionPathBroker.java 2009-01-24 19:40:48 UTC (rev 756)
+++ JMathLib/trunk/src/jmathlib/core/functions/FunctionPathBroker.java 2009-01-24 19:41:02 UTC (rev 757)
@@ -80,10 +80,10 @@
if(index > -1)
{
String tempFunction = fileName.substring(0, index);
- if(tempFunction.equalsIgnoreCase(functionName) &&
- (fileName.equalsIgnoreCase(functionName+".m") ||
- fileName.equalsIgnoreCase(functionName+".p") ||
- fileName.equalsIgnoreCase(functionName+".class") ) )
+ if(tempFunction.equals(functionName) &&
+ (fileName.equals(functionName+".m") ||
+ fileName.equals(functionName+".p") ||
+ fileName.equals(functionName+".class") ) )
{
result = files[fileNo];
break;
Modified: JMathLib/trunk/src/jmathlib/core/functions/ReflectionFunctionCall.java
===================================================================
--- JMathLib/trunk/src/jmathlib/core/functions/ReflectionFunctionCall.java 2009-01-24 19:40:48 UTC (rev 756)
+++ JMathLib/trunk/src/jmathlib/core/functions/ReflectionFunctionCall.java 2009-01-24 19:41:02 UTC (rev 757)
@@ -27,7 +27,7 @@
externalClass = _externalClass;
}
- public OperandToken evaluate(Token []operands)
+ public OperandToken evaluate(Token []operands, GlobalValues globals)
{
boolean found = false;
ErrorLogger.debugLine("evaluating reflection function");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <st_...@us...> - 2009-01-24 19:40:57
|
Revision: 756
http://mathlib.svn.sourceforge.net/mathlib/?rev=756&view=rev
Author: st_mueller
Date: 2009-01-24 19:40:48 +0000 (Sat, 24 Jan 2009)
Log Message:
-----------
changed signature of evaluate(Token[] operands)
to
evaluate(Token[] operands, GlobalValues globals)
Modified Paths:
--------------
JMathLib/trunk/src/jmathlib/core/interpreter/GlobalValues.java
Modified: JMathLib/trunk/src/jmathlib/core/interpreter/GlobalValues.java
===================================================================
--- JMathLib/trunk/src/jmathlib/core/interpreter/GlobalValues.java 2009-01-24 19:39:52 UTC (rev 755)
+++ JMathLib/trunk/src/jmathlib/core/interpreter/GlobalValues.java 2009-01-24 19:40:48 UTC (rev 756)
@@ -39,7 +39,7 @@
private jmathlib.plugins.PluginsManager pluginsManager;
/**sets whether to write debug lines to console and log files*/
- private boolean debug = true;
+ //private boolean debug = true;
/**stores the number format for displaying the number*/
public /*static transient*/ NumberFormat numFormat = new DecimalFormat("0.0000", new DecimalFormatSymbols(Locale.ENGLISH));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <st_...@us...> - 2009-01-24 19:39:56
|
Revision: 755
http://mathlib.svn.sourceforge.net/mathlib/?rev=755&view=rev
Author: st_mueller
Date: 2009-01-24 19:39:52 +0000 (Sat, 24 Jan 2009)
Log Message:
-----------
changed signature of evaluate(Token[] operands)
to
evaluate(Token[] operands, GlobalValues globals)
Modified Paths:
--------------
JMathLib/trunk/src/jmathlib/core/functions/UserFunction.java
Modified: JMathLib/trunk/src/jmathlib/core/functions/UserFunction.java
===================================================================
--- JMathLib/trunk/src/jmathlib/core/functions/UserFunction.java 2009-01-24 19:37:02 UTC (rev 754)
+++ JMathLib/trunk/src/jmathlib/core/functions/UserFunction.java 2009-01-24 19:39:52 UTC (rev 755)
@@ -30,9 +30,11 @@
}
/**Executes a user function
- @param operands - the array of parameters
- @return the result of the function as an OperandToken*/
- public OperandToken evaluate(Token[] operands)
+ * @param operands - the array of parameters
+ * @param globals
+ * @return the result of the function as an OperandToken
+ * */
+ public OperandToken evaluate(Token[] operands, GlobalValues globals)
{
Context functionContext; // The context of the function
OperandToken result = null;
@@ -43,7 +45,7 @@
{
// evaluate m-script
if (code!=null)
- result = code.evaluate(null);
+ result = code.evaluate(null, globals);
}
else
{
@@ -51,7 +53,7 @@
// m-functions have a local context (local variables)
VariableList localVariables = new VariableList();
- functionContext = getContextList().createContext(localVariables);
+ functionContext = globals.getContextList().createContext(localVariables);
//if nescessary create a context and store on list
//if(activeContext == null)
@@ -94,10 +96,10 @@
Errors.throwMathLibException("UserFunction: "+name+" number of parameters to large");
// set the variable NARGIN to the number of parameters of the calling function
- createVariable("nargin").assign(new DoubleNumberToken(opLength));
+ globals.createVariable("nargin").assign(new DoubleNumberToken(opLength));
// set the variable NARGOUT to the number of return values
- createVariable("nargout").assign(new DoubleNumberToken(returnVariables.size()));
+ globals.createVariable("nargout").assign(new DoubleNumberToken(returnVariables.size()));
//set the input parameters for the function
@@ -110,7 +112,7 @@
{
String parameterName = (String)parameterVariables.get(paramNo);
//System.out.println("UserFunction: "+parameterName);
- createVariable(parameterName).assign((OperandToken)operands[paramNo]);
+ globals.createVariable(parameterName).assign((OperandToken)operands[paramNo]);
}
}
else
@@ -124,7 +126,7 @@
{
String parameterName = (String)parameterVariables.get(paramNo);
ErrorLogger.debugLine("UserF: params: "+parameterName);
- createVariable(parameterName).assign((OperandToken)operands[paramNo]);
+ globals.createVariable(parameterName).assign((OperandToken)operands[paramNo]);
}
ErrorLogger.debugLine("UserF: remainingOps: "+ remainingOps);
@@ -141,13 +143,13 @@
values[i][0] = (OperandToken)operands[parameterVariables.size()-1+i];
}
CellArrayToken cell = new CellArrayToken(values);
- createVariable("varargin").assign(cell);
+ globals.createVariable("varargin").assign(cell);
}
else
{
// varargin is empty
CellArrayToken cell = new CellArrayToken();
- createVariable("varargin").assign(cell);
+ globals.createVariable("varargin").assign(cell);
}
}
@@ -157,7 +159,7 @@
{
// must clone function code, so that the original code remains untouched
OperandToken codeLocal = (OperandToken)code.clone();
- result = codeLocal.evaluate(null);
+ result = codeLocal.evaluate(null, globals);
// result should be DoubleNumberToken e.g. 1+2 -> >3<
@@ -167,7 +169,7 @@
String name = (String)returnVariables.get(0);
//System.out.println("UserFunction: returnVariable "+name);
//Variable var = (Variable)getVariables().getVariable(name);
- Variable var = getVariable(name);
+ Variable var = globals.getVariable(name);
result = var.getData();
}
else if (returnVariables.size() > 1)
@@ -181,7 +183,7 @@
{
String name = (String)returnVariables.get(i);
//Variable retVar = ((Variable)getVariables().getVariable(name));
- Variable retVar = getVariable(name);
+ Variable retVar = globals.getVariable(name);
// check if return variable has been used before
if (retVar != null)
values[0][i] = retVar.getData();
@@ -194,17 +196,17 @@
//reset to the previous variable frame
- getContextList().popContext();
+ globals.getContextList().popContext();
}
catch(ControlException e)
{
// assign return values
- getContextList().popContext();
+ globals.getContextList().popContext();
//activeContext = null;
}
catch (Exception e)
{
- getContextList().popContext();
+ globals.getContextList().popContext();
throwMathLibException(e.getMessage());
}
@@ -238,134 +240,45 @@
return equal;
}
- /**Returns the number of return variables of this function
- @return returnCount = number of return variables */
- //public int getReturnCount()
- //{
- // return returnVariables.size();
- //}
-
- /**Returns the number of parameters of this function
- @return parameterCount = number of parameters */
- //public int getParameterCount()
- //{
- // return paramaterNames.size();
- //}
-
+ /**
+ *
+ * @param _parameterVariables
+ */
public void setParameterVariables(ArrayList _parameterVariables)
{
//getLocalVariables().createVariable(name);
parameterVariables = _parameterVariables;
}
+ /**
+ *
+ * @param _returnVariables
+ */
public void setReturnVariables(ArrayList _returnVariables)
{
//getLocalVariables().createVariable(name);
returnVariables = _returnVariables;
}
- /**Sets the number of parameters of this function
- @param parameterCount = number of parameters */
- //public void setParameterCount(int _parameterCount)
- //{
- // //parameterCount = _parameterCount;
- //}
-
- /**Returns the name of this function
- @return name = name of this function */
- //public String getName()
- //{
- // return name;
- //}
-
- /**Sets the name of this function
- @param name = name of this function */
- //public void setName(String _name)
- //{
- // name = _name;
- //}
-
/**Sets the parsed code as a token tree
- @param code = parsed code of this function */
+ * @param code = parsed code of this function
+ */
public void setCode(OperandToken _code)
{
code = _code;
}
- /**Returns the local variables
- @return localVariables = local variables of this function */
- //public VariableList getLocalVariables()
- //{
- // //return functionContext.getVariables();
- // return getVariables();
- //}
-
-/* public void setFunctionParameters(Token[] operands)
- {
- //set the parameters for the function
- int noParameters =0;
- if (operands!=null) noParameters = operands.length;
-
- int parameterCount = getParameterCount();
-
- if(noParameters < parameterCount)
- {
- Errors.throwMathLibException(ERR_INSUFFICIENT_PARAMETERS, new Object[] {new DoubleNumberToken(parameterCount)});
- }
- else if(noParameters > parameterCount)
- {
- //set last param to be a list of parameters
- OperandToken[][] values = new OperandToken[1][noParameters - parameterCount + 1];
-
- for(int index = parameterCount - 1; index < noParameters; index++)
- {
- values[0][index - parameterCount + 1] = (OperandToken)operands[index];
- }
-
- operands[parameterCount - 1] = new MatrixToken(values);
- }
-
- for(int paramNo = 0; paramNo < parameterCount; paramNo++)
- {
- getVariables().setVariable(((String)parameterVariables.get(paramNo)), (OperandToken)operands[paramNo]);
- }
- }
-*/
-
- //public OperandToken getFunctionResult()
- //{
- // OperandToken result = null;
- // int returnCount = getReturnCount();
-
- // //acess the return values for the function
- // if(returnCount == 1)
- // {
- // String name = ((String)returnNames.get(0));
- // result = ((Variable)getVariables().getVariable(name)).getData();
- // }
- // else
- // {
- // OperandToken[][] values = new OperandToken[1][returnCount];
-
- // for(int index = 0; index < returnCount; index++)
- // {
- // String name = ((String)returnNames.get(index));
- // values[0][index] = ((Variable)getVariables().getVariable(name)).getData();
- // }
-
- // result = new MatrixToken(values);
- // }
-
- // return result;
- //}
-
- /** set true if this is a m-script file and not a function */
+ /** set true if this is a m-script file and not a function
+ * @param
+ */
public void setScript(boolean _mScriptB)
{
mScriptB = _mScriptB;
}
- /** returns true if this is a m-script file */
+ /** returns true if this is a m-script file
+ * @return
+ */
public boolean isScript()
{
return mScriptB;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <st_...@us...> - 2009-01-24 19:37:18
|
Revision: 754
http://mathlib.svn.sourceforge.net/mathlib/?rev=754&view=rev
Author: st_mueller
Date: 2009-01-24 19:37:02 +0000 (Sat, 24 Jan 2009)
Log Message:
-----------
changed signature of evaluate(Token[] operands)
to
evaluate(Token[] operands, GlobalValues globals)
Modified Paths:
--------------
JMathLib/trunk/src/jmathlib/core/functions/SFunction.java
Modified: JMathLib/trunk/src/jmathlib/core/functions/SFunction.java
===================================================================
--- JMathLib/trunk/src/jmathlib/core/functions/SFunction.java 2009-01-24 19:36:45 UTC (rev 753)
+++ JMathLib/trunk/src/jmathlib/core/functions/SFunction.java 2009-01-24 19:37:02 UTC (rev 754)
@@ -4,6 +4,7 @@
package jmathlib.core.functions;
import jmathlib.core.interpreter.Errors;
+import jmathlib.core.interpreter.GlobalValues;
import jmathlib.core.tokens.OperandToken;
import jmathlib.core.tokens.Token;
@@ -22,7 +23,7 @@
//
//}
- public OperandToken evaluate(Token[] operands)
+ public OperandToken evaluate(Token[] operands, GlobalValues globals)
{
Errors.throwMathLibException("SFunction: not yet implemented");
return null;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <st_...@us...> - 2009-01-24 19:36:59
|
Revision: 753
http://mathlib.svn.sourceforge.net/mathlib/?rev=753&view=rev
Author: st_mueller
Date: 2009-01-24 19:36:45 +0000 (Sat, 24 Jan 2009)
Log Message:
-----------
changed signature of evaluate(Token[] operands)
to
evaluate(Token[] operands, GlobalValues globals)
Modified Paths:
--------------
JMathLib/trunk/src/jmathlib/core/functions/InternalFunction.java
Modified: JMathLib/trunk/src/jmathlib/core/functions/InternalFunction.java
===================================================================
--- JMathLib/trunk/src/jmathlib/core/functions/InternalFunction.java 2009-01-24 19:36:08 UTC (rev 752)
+++ JMathLib/trunk/src/jmathlib/core/functions/InternalFunction.java 2009-01-24 19:36:45 UTC (rev 753)
@@ -1,5 +1,6 @@
package jmathlib.core.functions;
+import jmathlib.core.interpreter.GlobalValues;
import jmathlib.core.tokens.Token;
import jmathlib.core.tokens.OperandToken;
@@ -13,16 +14,20 @@
}
/**Creates an internal function with it's name set to _name
- @param _name = the name of the function*/
+ * @param _name = the name of the function
+ */
public InternalFunction(String _name)
{
name = _name;
}
- /**Executes the internal function
- @param operands - the array of parameters
- @return the result as an OperandToken*/
- public OperandToken evaluate(Token[] operands)
+ /**
+ * Executes the internal function
+ * @param operands - the array of parameters
+ * @param pointer to global values
+ * @return the result as an OperandToken
+ */
+ public OperandToken evaluate(Token[] operands, GlobalValues globals)
{
return null;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <st_...@us...> - 2009-01-24 19:36:16
|
Revision: 752
http://mathlib.svn.sourceforge.net/mathlib/?rev=752&view=rev
Author: st_mueller
Date: 2009-01-24 19:36:08 +0000 (Sat, 24 Jan 2009)
Log Message:
-----------
changed signature of evaluate(Token[] operands)
to
evaluate(Token[] operands, GlobalValues globals)
Modified Paths:
--------------
JMathLib/trunk/src/jmathlib/core/functions/Function.java
Modified: JMathLib/trunk/src/jmathlib/core/functions/Function.java
===================================================================
--- JMathLib/trunk/src/jmathlib/core/functions/Function.java 2009-01-24 09:30:51 UTC (rev 751)
+++ JMathLib/trunk/src/jmathlib/core/functions/Function.java 2009-01-24 19:36:08 UTC (rev 752)
@@ -27,19 +27,21 @@
}
/**Creates a function called _name
- @param _name = the name of the function*/
+ * @param _name = the name of the function
+ */
public Function(String _name)
{
name = _name;
}
- /**@return the name of the function*/
+ /**
+ * @return the name of the function
+ */
public String getName()
{
return name;
}
-
/**
* sets the path and filename that belongs to this functions
* @param _pathAndFileName
@@ -77,33 +79,37 @@
}
/**Sets the name of this function
- @param name = name of this function */
+ * @param name = name of this function
+ */
public void setName(String _name)
{
name = _name;
}
/**Returns the number of left-hand arguments of the function
- (e.g.) [a,b,c]=some_function will return "3"
- @return the number of left hand arguments*/
+ * (e.g.) [a,b,c]=some_function will return "3"
+ * @return the number of left hand arguments
+ */
public int getNoOfLeftHandArguments()
{
return nargout;
}
/**Returns the number of left-hand arguments of the function
- (e.g.) [a,b,c]=some_function will return "3"
- @return the number of left hand arguments*/
+ * (e.g.) [a,b,c]=some_function will return "3"
+ * @return the number of left hand arguments
+ */
protected int getNArgOut()
{
return nargout;
}
/**Returns the number of right-hand arguments of the function
- (e.g.: a=some_function(a,b,c,d) will return "4"
- @return number of right hand arguments. Returns -1 if there
- are no right hand arguments. Returns also -1 if there
- if one argument==null */
+ * (e.g.: a=some_function(a,b,c,d) will return "4"
+ * @return number of right hand arguments. Returns -1 if there
+ * are no right hand arguments. Returns also -1 if there
+ * if one argument==null
+ */
protected int getNArgIn(Token[] operands)
{
// Check if there are arguments at all
@@ -114,8 +120,9 @@
}
/**Sets the number of left-hand arguments of the function
- (e.g.) [a,b,c]=some_function will return set a "3"
- @param _number = the number of left hand arguments*/
+ * (e.g.) [a,b,c]=some_function will return set a "3"
+ * @param _number = the number of left hand arguments
+ */
public void setNoOfLeftHandArguments(int _number)
{
nargout = _number;
@@ -123,27 +130,36 @@
/**Tests if an object is equal to this function
- if obj is an instance of Function or Function token then it
- compares the name of obj to the functions name otherwise it
- calls the superclasses version
- @param obj = object to test
- @return true if the objects are equal*/
+ * if obj is an instance of Function or Function token then it
+ * compares the name of obj to the functions name otherwise it
+ * calls the superclasses version
+ * @param obj = object to test
+ * @return true if the objects are equal
+ */
public boolean equals(Object obj)
{
boolean equal = false;
if(obj instanceof Function)
- equal = ((Function)obj).getName().toUpperCase() == name.toUpperCase();
+ {
+ equal = ((Function)obj).getName() == name;
+ }
else if(obj instanceof FunctionToken)
- equal = ((FunctionToken)obj).getName().toUpperCase() == name.toUpperCase();
+ {
+ equal = ((FunctionToken)obj).getName() == name;
+ }
else
- equal = super.equals(obj);
+ {
+ equal = super.equals(obj);
+ }
return equal;
}
/**Executes the function
- @param operands - an array of the functions paramaters
- @return the result as an OperandToken*/
- abstract public OperandToken evaluate(Token[] operands);
+ * @param operands - an array of the functions paramaters
+ * @param globals TODO
+ * @return the result as an OperandToken
+ */
+ abstract public OperandToken evaluate(Token[] operands, GlobalValues globals);
/**Throws arithmetic exception for external functions
* @param error text to display
@@ -154,7 +170,6 @@
}
/** write debug line to std-out and file
- *
* @param s
*/
public void debugLine(String s)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <st_...@us...> - 2009-01-24 09:30:54
|
Revision: 751
http://mathlib.svn.sourceforge.net/mathlib/?rev=751&view=rev
Author: st_mueller
Date: 2009-01-24 09:30:51 +0000 (Sat, 24 Jan 2009)
Log Message:
-----------
changed signature of evaluate(Token[] operands)
to
evaluate(Token[] operands, GlobalValues globals)
Modified Paths:
--------------
JMathLib/trunk/src/jmathlib/core/tokens/Token.java
Modified: JMathLib/trunk/src/jmathlib/core/tokens/Token.java
===================================================================
--- JMathLib/trunk/src/jmathlib/core/tokens/Token.java 2009-01-24 09:29:27 UTC (rev 750)
+++ JMathLib/trunk/src/jmathlib/core/tokens/Token.java 2009-01-24 09:30:51 UTC (rev 751)
@@ -14,26 +14,31 @@
displayed at the prompt */
private boolean displayResultSwitch = false;
- /**Default Constructor - create a token with the type not set*/
+ /**Default Constructor - create a token with the type not set
+ */
public Token()
{
priority = 0;
}
/**Constructor
- @param _priority = priority of token
- @param _type = the type of token being created*/
+ * @param _priority = priority of token
+ */
public Token(int _priority)
{
priority = _priority;
}
/**evaluate the token
- @param operands = an array of RootObject containing the tokens operands
- @return the result of the token evaluation as a RootObject*/
- public abstract OperandToken evaluate(Token[] operands);
+ * @param operands = an array of RootObject containing the tokens operands
+ * @param
+ * @return the result of the token evaluation as a RootObject
+ * */
+ public abstract OperandToken evaluate(Token[] operands, GlobalValues globals);
- /**@return a string representation of the token*/
+ /**
+ * @return a string representation of the token
+ */
abstract public String toString();
/**Converts the token to its MathML representation. At the moment this is unimplemented and just
@@ -49,7 +54,9 @@
displayResultSwitch = _displayResultSwitch;
}
- /** return if the display flag for a given token is set */
+ /** return if the display flag for a given token is set
+ * @return
+ */
public boolean isDisplayResult()
{
return displayResultSwitch;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <st_...@us...> - 2009-01-24 09:29:29
|
Revision: 750
http://mathlib.svn.sourceforge.net/mathlib/?rev=750&view=rev
Author: st_mueller
Date: 2009-01-24 09:29:27 +0000 (Sat, 24 Jan 2009)
Log Message:
-----------
changed signature of evaluate(Token[] operands)
to
evaluate(Token[] operands, GlobalValues globals)
Modified Paths:
--------------
JMathLib/trunk/src/jmathlib/core/tokens/SwitchToken.java
Modified: JMathLib/trunk/src/jmathlib/core/tokens/SwitchToken.java
===================================================================
--- JMathLib/trunk/src/jmathlib/core/tokens/SwitchToken.java 2009-01-24 09:27:55 UTC (rev 749)
+++ JMathLib/trunk/src/jmathlib/core/tokens/SwitchToken.java 2009-01-24 09:29:27 UTC (rev 750)
@@ -1,6 +1,8 @@
package jmathlib.core.tokens;
import jmathlib.core.interpreter.ErrorLogger;
+import jmathlib.core.interpreter.GlobalValues;
+
import java.util.Vector;
@@ -15,28 +17,39 @@
Vector cases;
/**Constructor setting cases
- @param _value = an OperandToken containing the value to test
- @param _cases = a vector of case tokens*/
+ * @param _value = an OperandToken containing the value to test
+ * @param _cases = a vector of case tokens
+ */
public SwitchToken(OperandToken _value, Vector _cases)
{
value = _value;
cases = _cases;
}
+ /**
+ *
+ * @return
+ */
public OperandToken getData()
{
return value;
}
+ /**
+ *
+ * @return
+ */
public Vector getCases()
{
return cases;
}
/**evaluates the operator
- @param operands = the operators operands
- @return the result of the test as an OperandToken*/
- public OperandToken evaluate(Token[] operands)
+ * @param operands = the operators operands
+ * @param
+ * @return the result of the test as an OperandToken
+ */
+ public OperandToken evaluate(Token[] operands, GlobalValues globals)
{
OperandToken result = null;
@@ -47,7 +60,7 @@
CaseToken caseToken = ((CaseToken)cases.elementAt(pos));
ErrorLogger.debugLine("switch "+caseToken.toString());
- result = caseToken.evaluate(new OperandToken[]{value});
+ result = caseToken.evaluate(new OperandToken[]{value}, globals);
pos++;
}
@@ -57,7 +70,8 @@
/**Convert the operator to a string
- @return the operator as a string*/
+ * @return the operator as a string
+ */
public String toString()
{
return "switch"; //( "+value.toString()+" )";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <st_...@us...> - 2009-01-24 09:28:01
|
Revision: 749
http://mathlib.svn.sourceforge.net/mathlib/?rev=749&view=rev
Author: st_mueller
Date: 2009-01-24 09:27:55 +0000 (Sat, 24 Jan 2009)
Log Message:
-----------
changed signature of evaluate(Token[] operands)
to
evaluate(Token[] operands, GlobalValues globals)
Modified Paths:
--------------
JMathLib/trunk/src/jmathlib/core/tokens/CellArrayToken.java
Modified: JMathLib/trunk/src/jmathlib/core/tokens/CellArrayToken.java
===================================================================
--- JMathLib/trunk/src/jmathlib/core/tokens/CellArrayToken.java 2009-01-24 09:22:42 UTC (rev 748)
+++ JMathLib/trunk/src/jmathlib/core/tokens/CellArrayToken.java 2009-01-24 09:27:55 UTC (rev 749)
@@ -6,9 +6,9 @@
* e.g. a={ 3, [1,2,3;4,5,6], "hello" ; "barfoo" , rand(5), 1+2 } */
public class CellArrayToken extends DataToken
{
+ /** values of the cell array */
+ OperandToken values[][];
- OperandToken values[][]; // values of the cell array
-
/** Constructor creating empty cell array token
*/
public CellArrayToken()
@@ -22,7 +22,8 @@
}
/**Constructor for cell arrays
- @param _value = the values of the elements of the cell array*/
+ * @param _value = the values of the elements of the cell array
+ */
public CellArrayToken(OperandToken[][] _values)
{
super(5, "cell");
@@ -34,7 +35,8 @@
}
/**Constructor for cell array with 1x1 size
- @param _value = the values of the elements of the matrix*/
+ * @param _value = the values of the elements of the matrix
+ */
public CellArrayToken(OperandToken _value)
{
super(5, "cell");
@@ -47,7 +49,9 @@
}
/** return a new CellArrayToken of size y*x
- *
+ * @param y
+ * @param x
+ * @return DataToken
*/
public DataToken getElementSized(int y, int x)
{
@@ -55,7 +59,8 @@
}
/**
- *
+ * @param dy
+ * @praram dx
*/
public void setSize(int dy, int dx)
{
@@ -80,7 +85,10 @@
} // end setSize
-
+ /**
+ * @param n
+ * @return
+ */
public OperandToken getElement(int n)
{
int x = (int) (n/sizeY); // column to start
@@ -90,7 +98,9 @@
}
/**
- *
+ * @param y
+ * @param x
+ * @return
*/
public OperandToken getElement(int y, int x)
{
@@ -99,13 +109,19 @@
}
/**
- *
+ * @param y
+ * @param x
+ * @param op
*/
public void setElement(int y, int x, OperandToken op)
{
values[y][x]= op; //((CellArrayToken)op).getValue()[0][0];
}
+ /**
+ * @param n
+ * @param num
+ */
public void setElement(int n, OperandToken num)
{
int x = (int)(n/sizeY); // column to start
@@ -116,9 +132,10 @@
/**evaluate function - just returns the object itself
- @param operands = the cell arrray operands (not used)
- @return the cell array itself*/
- public OperandToken evaluate(Token[] operands)
+ * @param operands = the cell arrray operands (not used)
+ * @return the cell array itself
+ */
+ public OperandToken evaluate(Token[] operands, GlobalValues globals)
{
ErrorLogger.debugLine("CellArray evaluate size: "+sizeY+" "+sizeX);
@@ -135,7 +152,7 @@
for (int xx=0; xx<values[yy].length; xx++)
{
if (values[yy][xx] != null) // only evaluate non-null elements
- values[yy][xx] = values[yy][xx].evaluate(null);
+ values[yy][xx] = values[yy][xx].evaluate(null, globals);
} // end xx
@@ -154,7 +171,8 @@
} // end evaluate
/**Convert the matrix to a string
- * @return string representation of cell array*/
+ * @return string representation of cell array
+ */
public String toString()
{
@@ -187,7 +205,8 @@
/**Return the value of the number
- @return the value as an 2D array of double*/
+ * @return the value as an 2D array of double
+ */
public OperandToken[][] getValue()
{
ErrorLogger.debugLine("CellArray getValue");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <st_...@us...> - 2009-01-24 09:22:46
|
Revision: 748
http://mathlib.svn.sourceforge.net/mathlib/?rev=748&view=rev
Author: st_mueller
Date: 2009-01-24 09:22:42 +0000 (Sat, 24 Jan 2009)
Log Message:
-----------
changed signature of evaluate(Token[] operands)
to
evaluate(Token[] operands, GlobalValues globals)
Modified Paths:
--------------
JMathLib/trunk/src/jmathlib/core/tokens/ColonOperatorToken.java
JMathLib/trunk/src/jmathlib/core/tokens/CommandToken.java
JMathLib/trunk/src/jmathlib/core/tokens/ConditionToken.java
Modified: JMathLib/trunk/src/jmathlib/core/tokens/ColonOperatorToken.java
===================================================================
--- JMathLib/trunk/src/jmathlib/core/tokens/ColonOperatorToken.java 2009-01-24 09:20:41 UTC (rev 747)
+++ JMathLib/trunk/src/jmathlib/core/tokens/ColonOperatorToken.java 2009-01-24 09:22:42 UTC (rev 748)
@@ -16,7 +16,7 @@
}
/**evaluates the operator*/
- public OperandToken evaluate(Token[] operands)
+ public OperandToken evaluate(Token[] operands, GlobalValues globals)
{
double x1; // minimum
Modified: JMathLib/trunk/src/jmathlib/core/tokens/CommandToken.java
===================================================================
--- JMathLib/trunk/src/jmathlib/core/tokens/CommandToken.java 2009-01-24 09:20:41 UTC (rev 747)
+++ JMathLib/trunk/src/jmathlib/core/tokens/CommandToken.java 2009-01-24 09:22:42 UTC (rev 748)
@@ -1,5 +1,7 @@
package jmathlib.core.tokens;
+import jmathlib.core.interpreter.GlobalValues;
+
/**Class for implementing commands */
public class CommandToken extends OperandToken
{
@@ -18,7 +20,7 @@
/**Evaluates the command
@param operands = the commands operands
@return the result of the command as an OperandToken*/
- public OperandToken evaluate(Token[] operands)
+ public OperandToken evaluate(Token[] operands, GlobalValues globals)
{
return null;
}
Modified: JMathLib/trunk/src/jmathlib/core/tokens/ConditionToken.java
===================================================================
--- JMathLib/trunk/src/jmathlib/core/tokens/ConditionToken.java 2009-01-24 09:20:41 UTC (rev 747)
+++ JMathLib/trunk/src/jmathlib/core/tokens/ConditionToken.java 2009-01-24 09:22:42 UTC (rev 748)
@@ -13,8 +13,9 @@
private OperandToken code;
/**Constructor setting ifRelation and ifCode
- @param _ifRelation = the test relation
- @param _ifCode = the code to execute if the test is true*/
+ * @param _ifRelation = the test relation
+ * @param _ifCode = the code to execute if the test is true
+ */
public ConditionToken(OperandToken _condition, OperandToken _code)
{
condition = _condition;
@@ -40,14 +41,15 @@
}
/**evaluates the operator
- @param operands = the operators operands
- @return the result of the test as an OperandToken*/
- public OperandToken evaluate(Token[] operands)
+ * @param operands = the operators operands
+ * @param
+ * @return the result of the test as an OperandToken*/
+ public OperandToken evaluate(Token[] operands, GlobalValues globals)
{
if(condition != null)
{
ErrorLogger.debugLine("ConditionToken: testing " + condition.toString());
- OperandToken result = condition.evaluate(null);
+ OperandToken result = condition.evaluate(null, globals);
if(result instanceof DoubleNumberToken)
{
@@ -64,7 +66,7 @@
if(tag)
{
// evaluate Code
- code.evaluate(null);
+ code.evaluate(null, globals);
return DoubleNumberToken.one;
}
}
@@ -83,21 +85,20 @@
if (tag)
{
// evaluate Code
- code.evaluate(null);
+ code.evaluate(null, globals);
return DoubleNumberToken.one;
}
}
}
else
{
- code.evaluate(null);
+ code.evaluate(null, globals);
return DoubleNumberToken.one;
}
return null;
}
-
/**Convert the operator to a string
* @return the operator as a string
*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <st_...@us...> - 2009-01-24 09:20:44
|
Revision: 747
http://mathlib.svn.sourceforge.net/mathlib/?rev=747&view=rev
Author: st_mueller
Date: 2009-01-24 09:20:41 +0000 (Sat, 24 Jan 2009)
Log Message:
-----------
changed signature of evaluate(Token[] operands)
to
evaluate(Token[] operands, GlobalValues globals)
Modified Paths:
--------------
JMathLib/trunk/src/jmathlib/core/tokens/CharToken.java
Modified: JMathLib/trunk/src/jmathlib/core/tokens/CharToken.java
===================================================================
--- JMathLib/trunk/src/jmathlib/core/tokens/CharToken.java 2009-01-24 09:17:31 UTC (rev 746)
+++ JMathLib/trunk/src/jmathlib/core/tokens/CharToken.java 2009-01-24 09:20:41 UTC (rev 747)
@@ -21,7 +21,8 @@
}
/**Creates a string with a value of _value
- @param _value = the value of the string*/
+ * @param _value = the value of the string
+ */
public CharToken(String _value)
{
super(99, "char");
@@ -34,7 +35,8 @@
}
/**Creates a string with a value of _value
- @param _value = the value of the string*/
+ * @param _value = the value of the string
+ */
public CharToken(String[] _values)
{
super(99, "char");
@@ -53,7 +55,8 @@
/**Creates a string with a value of _value
- @param _value = the value of the string*/
+ * @param _value = the value of the string
+ */
public CharToken(char[][] _values)
{
super(99, "char");
@@ -65,7 +68,8 @@
}
/**Creates a string with a value of _value
- @param _value = the value of the string*/
+ * @param _value = the value of the string
+ */
public CharToken(char _value)
{
super(99, "char");
@@ -78,14 +82,18 @@
}
/**Evaluates the token, just returns the token itself
- @param operands = the tokens operands (not used)
- @return the token itself as an OperandToken*/
- public OperandToken evaluate(Token[] operands)
+ * @param operands = the tokens operands (not used)
+ * @param
+ * @return the token itself as an OperandToken
+ */
+ public OperandToken evaluate(Token[] operands, GlobalValues globals)
{
return this;
}
- /**@return the string value*/
+ /**
+ * @return the string value
+ */
public String toString()
{
String ret = new String();
@@ -96,24 +104,36 @@
return ret;
}
- /**@return the value of the string*/
+ /**
+ * @return the value of the string
+ */
public String getValue()
{
return new String(values[0]);
}
- /**@return the value of the string*/
+ /**
+ * @return the value of the string
+ */
public char getCharValue()
{
return values[0][0];
}
-
+ /**
+ * @param
+ * @param
+ */
public OperandToken getElement(int y, int x)
{
return new CharToken(values[y][x]);
}
+ /**
+ * @param
+ * @param
+ * @param
+ */
public void setElement(int y, int x, OperandToken op)
{
char c = ((CharToken)op).getCharValue();
@@ -122,13 +142,20 @@
values[y][x] = c;
}
+ /**
+ * @param
+ * @param
+ * @return
+ */
public DataToken getElementSized(int y, int x)
{
return new CharToken(new char[y][x]);
}
/**add arg to this object to create a new string
- @param arg = the value to add to the string*/
+ * @param arg = the value to add to the string
+ * @return
+ */
public OperandToken add(OperandToken arg)
{
if (sizeY!=1)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <st_...@us...> - 2009-01-24 09:17:40
|
Revision: 746
http://mathlib.svn.sourceforge.net/mathlib/?rev=746&view=rev
Author: st_mueller
Date: 2009-01-24 09:17:31 +0000 (Sat, 24 Jan 2009)
Log Message:
-----------
changed signature of evaluate(Token[] operands)
to
evaluate(Token[] operands, GlobalValues globals)
Modified Paths:
--------------
JMathLib/trunk/src/jmathlib/core/tokens/DelimiterToken.java
JMathLib/trunk/src/jmathlib/core/tokens/FunctionHandleToken.java
Modified: JMathLib/trunk/src/jmathlib/core/tokens/DelimiterToken.java
===================================================================
--- JMathLib/trunk/src/jmathlib/core/tokens/DelimiterToken.java 2009-01-24 09:16:55 UTC (rev 745)
+++ JMathLib/trunk/src/jmathlib/core/tokens/DelimiterToken.java 2009-01-24 09:17:31 UTC (rev 746)
@@ -1,6 +1,7 @@
package jmathlib.core.tokens;
import jmathlib.core.constants.TokenConstants;
+import jmathlib.core.interpreter.GlobalValues;
/*Class used to represent delimiter tokens such as ( ) and ,*/
public class DelimiterToken extends OperandToken implements TokenConstants
@@ -29,7 +30,7 @@
/**Evaluate the delimiter, just returns the object itself
@param operands = the delimiters operands
@return the delimter token as an OperandToken*/
- public OperandToken evaluate(Token[] operands)
+ public OperandToken evaluate(Token[] operands, GlobalValues globals)
{
return this;
}
Modified: JMathLib/trunk/src/jmathlib/core/tokens/FunctionHandleToken.java
===================================================================
--- JMathLib/trunk/src/jmathlib/core/tokens/FunctionHandleToken.java 2009-01-24 09:16:55 UTC (rev 745)
+++ JMathLib/trunk/src/jmathlib/core/tokens/FunctionHandleToken.java 2009-01-24 09:17:31 UTC (rev 746)
@@ -1,6 +1,8 @@
package jmathlib.core.tokens;
+import jmathlib.core.interpreter.GlobalValues;
+
/**
*
* @author stefan
@@ -31,7 +33,7 @@
/**Evaluate the token. This causes it to return itself*/
- public OperandToken evaluate(Token[] operands)
+ public OperandToken evaluate(Token[] operands, GlobalValues globals)
{
return this;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <st_...@us...> - 2009-01-24 09:17:05
|
Revision: 745
http://mathlib.svn.sourceforge.net/mathlib/?rev=745&view=rev
Author: st_mueller
Date: 2009-01-24 09:16:55 +0000 (Sat, 24 Jan 2009)
Log Message:
-----------
changed signature of evaluate(Token[] operands)
to
evaluate(Token[] operands, GlobalValues globals)
Modified Paths:
--------------
JMathLib/trunk/src/jmathlib/core/tokens/BinaryOperatorToken.java
JMathLib/trunk/src/jmathlib/core/tokens/CaseToken.java
Modified: JMathLib/trunk/src/jmathlib/core/tokens/BinaryOperatorToken.java
===================================================================
--- JMathLib/trunk/src/jmathlib/core/tokens/BinaryOperatorToken.java 2009-01-24 09:15:51 UTC (rev 744)
+++ JMathLib/trunk/src/jmathlib/core/tokens/BinaryOperatorToken.java 2009-01-24 09:16:55 UTC (rev 745)
@@ -1,6 +1,8 @@
package jmathlib.core.tokens;
+import jmathlib.core.interpreter.GlobalValues;
+
/**The base class for all binary operators*/
public class BinaryOperatorToken extends OperatorToken
{
@@ -26,7 +28,7 @@
/**evaluate the operator
@param operands = the operators operands
@return the result as and OperandToken*/
- public OperandToken evaluate(Token[] operands)
+ public OperandToken evaluate(Token[] operands, GlobalValues globals)
{
return null;
}
Modified: JMathLib/trunk/src/jmathlib/core/tokens/CaseToken.java
===================================================================
--- JMathLib/trunk/src/jmathlib/core/tokens/CaseToken.java 2009-01-24 09:15:51 UTC (rev 744)
+++ JMathLib/trunk/src/jmathlib/core/tokens/CaseToken.java 2009-01-24 09:16:55 UTC (rev 745)
@@ -1,6 +1,7 @@
package jmathlib.core.tokens;
import jmathlib.core.interpreter.ErrorLogger;
+import jmathlib.core.interpreter.GlobalValues;
/**Used to implement if-then-else operations within an expression*/
@@ -31,7 +32,7 @@
/**evaluates the operator
@param operands = the operators operands
@return the result of the test as an OperandToken*/
- public OperandToken evaluate(Token[] operands)
+ public OperandToken evaluate(Token[] operands, GlobalValues globals)
{
if(value != null)
{
@@ -39,14 +40,14 @@
((OperandToken)operands[0]),
value);
- OperandToken result = exp.evaluate(null);
+ OperandToken result = exp.evaluate(null, globals);
if(result instanceof LogicalToken)
{
if(((LogicalToken)result).getValue(0))
{
ErrorLogger.debugLine("case is TRUE ");
- code.evaluate(null);
+ code.evaluate(null, globals);
return new LogicalToken(true);
}
}
@@ -54,7 +55,7 @@
else
{
ErrorLogger.debugLine("case is DEFAULT ");
- code.evaluate(null);
+ code.evaluate(null, globals);
return new LogicalToken(true);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <st_...@us...> - 2009-01-24 09:15:53
|
Revision: 744
http://mathlib.svn.sourceforge.net/mathlib/?rev=744&view=rev
Author: st_mueller
Date: 2009-01-24 09:15:51 +0000 (Sat, 24 Jan 2009)
Log Message:
-----------
changed signature of evaluate(Token[] operands)
to
evaluate(Token[] operands, GlobalValues globals)
Modified Paths:
--------------
JMathLib/trunk/src/jmathlib/core/tokens/PowerOperatorToken.java
JMathLib/trunk/src/jmathlib/core/tokens/RelationOperatorToken.java
JMathLib/trunk/src/jmathlib/core/tokens/SparseNumberToken.java
Modified: JMathLib/trunk/src/jmathlib/core/tokens/PowerOperatorToken.java
===================================================================
--- JMathLib/trunk/src/jmathlib/core/tokens/PowerOperatorToken.java 2009-01-24 09:13:36 UTC (rev 743)
+++ JMathLib/trunk/src/jmathlib/core/tokens/PowerOperatorToken.java 2009-01-24 09:15:51 UTC (rev 744)
@@ -17,7 +17,7 @@
/**evaluates the operator
@param operands = the operators operands
@return the result as an OperandToken*/
- public OperandToken evaluate(Token[] operands)
+ public OperandToken evaluate(Token[] operands, GlobalValues globals)
{
OperandToken result = null;
Modified: JMathLib/trunk/src/jmathlib/core/tokens/RelationOperatorToken.java
===================================================================
--- JMathLib/trunk/src/jmathlib/core/tokens/RelationOperatorToken.java 2009-01-24 09:13:36 UTC (rev 743)
+++ JMathLib/trunk/src/jmathlib/core/tokens/RelationOperatorToken.java 2009-01-24 09:15:51 UTC (rev 744)
@@ -51,7 +51,7 @@
* @param operands = the operators operands
* @return the result as an OperandToken
*/
- public OperandToken evaluate(Token[] operands)
+ public OperandToken evaluate(Token[] operands, GlobalValues globals)
{
ErrorLogger.debugLine("RelationToken: evaluate");
Modified: JMathLib/trunk/src/jmathlib/core/tokens/SparseNumberToken.java
===================================================================
--- JMathLib/trunk/src/jmathlib/core/tokens/SparseNumberToken.java 2009-01-24 09:13:36 UTC (rev 743)
+++ JMathLib/trunk/src/jmathlib/core/tokens/SparseNumberToken.java 2009-01-24 09:15:51 UTC (rev 744)
@@ -447,7 +447,7 @@
}
/**Evaluate the token. This causes it to return itself*/
- public OperandToken evaluate(Token[] operands)
+ public OperandToken evaluate(Token[] operands, GlobalValues globals)
{
return this;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <st_...@us...> - 2009-01-24 09:13:39
|
Revision: 743
http://mathlib.svn.sourceforge.net/mathlib/?rev=743&view=rev
Author: st_mueller
Date: 2009-01-24 09:13:36 +0000 (Sat, 24 Jan 2009)
Log Message:
-----------
changed signature of evaluate(Token[] operands)
to
evaluate(Token[] operands, GlobalValues globals)
Modified Paths:
--------------
JMathLib/trunk/src/jmathlibtests/toolbox/general/testGlobal.java
Modified: JMathLib/trunk/src/jmathlibtests/toolbox/general/testGlobal.java
===================================================================
--- JMathLib/trunk/src/jmathlibtests/toolbox/general/testGlobal.java 2009-01-24 09:12:07 UTC (rev 742)
+++ JMathLib/trunk/src/jmathlibtests/toolbox/general/testGlobal.java 2009-01-24 09:13:36 UTC (rev 743)
@@ -1,3 +1,12 @@
+/*
+ * This file is part or JMathLib
+ *
+ * Check it out at http://www.jmathlib.de
+ *
+ * Author: Stefan Mueller (st...@he...)
+ * (c) 2008, 2009
+ */
+
package jmathlibtests.toolbox.general;
import jmathlib.core.interpreter.Interpreter;
@@ -61,7 +70,7 @@
//Expected an exception here
try {
doit = funcParser.parseFunction(b.toString());
- doit.evaluate(null);
+ doit.evaluate(null, ml.globals);
}
catch (MathLibException ex) {
exCaught = true;
@@ -81,7 +90,7 @@
FunctionParser funcParser = new FunctionParser();
Function doit = funcParser.parseFunction(b.toString());
assertNotNull(doit);
- ml.getFunctionManager().addFunctionLoader(new TestFunctionLoader(doit));
+ ml.globals.getFunctionManager().addFunctionLoader(new TestFunctionLoader(doit));
b = new StringBuffer();
b.append("a = 1;\n");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <st_...@us...> - 2009-01-24 09:12:16
|
Revision: 742
http://mathlib.svn.sourceforge.net/mathlib/?rev=742&view=rev
Author: st_mueller
Date: 2009-01-24 09:12:07 +0000 (Sat, 24 Jan 2009)
Log Message:
-----------
check upper and lower case of function names: e.g. sin is unequal to SIN
Modified Paths:
--------------
JMathLib/trunk/src/jmathlibtests/toolbox/general/testSetPFileCaching.java
Modified: JMathLib/trunk/src/jmathlibtests/toolbox/general/testSetPFileCaching.java
===================================================================
--- JMathLib/trunk/src/jmathlibtests/toolbox/general/testSetPFileCaching.java 2009-01-24 09:10:55 UTC (rev 741)
+++ JMathLib/trunk/src/jmathlibtests/toolbox/general/testSetPFileCaching.java 2009-01-24 09:12:07 UTC (rev 742)
@@ -24,26 +24,26 @@
}
public void testSetPFileCaching01() {
- ml.executeExpression("setPFileCaching(1)");
- ml.executeExpression("a=getPFileCaching()");
+ ml.executeExpression("setpfilecaching(1)");
+ ml.executeExpression("a=getpfilecaching()");
assertTrue(1 == ml.getScalarValueRe("a"));
}
public void testSetPFileCaching02() {
- ml.executeExpression("setPFileCaching(0)");
- ml.executeExpression("a=getPFileCaching()");
+ ml.executeExpression("setpfilecaching(0)");
+ ml.executeExpression("a=getpfilecaching()");
assertTrue(0 == ml.getScalarValueRe("a"));
}
public void testSetPFileCaching03() {
- ml.executeExpression("setPFileCaching('on')");
- ml.executeExpression("a=getPFileCaching()");
+ ml.executeExpression("setpfilecaching('on')");
+ ml.executeExpression("a=getpfilecaching()");
assertTrue(1 == ml.getScalarValueRe("a"));
}
public void testSetPFileCaching04() {
- ml.executeExpression("setPFileCaching('off')");
- ml.executeExpression("a=getPFileCaching()");
+ ml.executeExpression("setpfilecaching('off')");
+ ml.executeExpression("a=getpfilecaching()");
assertTrue(0 == ml.getScalarValueRe("a"));
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <st_...@us...> - 2009-01-24 09:10:57
|
Revision: 741
http://mathlib.svn.sourceforge.net/mathlib/?rev=741&view=rev
Author: st_mueller
Date: 2009-01-24 09:10:55 +0000 (Sat, 24 Jan 2009)
Log Message:
-----------
changed signature of evaluate(Token[] operands)
to
evaluate(Token[] operands, GlobalValues globals)
Modified Paths:
--------------
JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/subassign.java
JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/submatrix.java
Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/subassign.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/subassign.java 2009-01-24 09:03:24 UTC (rev 740)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/subassign.java 2009-01-24 09:10:55 UTC (rev 741)
@@ -28,7 +28,7 @@
a = subassign(a,b,:,2) assigns b as the second column of a,
a = subassign(a,b,2:3,0:2) assigns b as a 2-by-3 submatrix of a,
a = subassign(a,b,2) returns the first element of the second row of a*/
- public OperandToken evaluate(Token[] operands)
+ public OperandToken evaluate(Token[] operands, GlobalValues globals)
{
DataToken retToken = null;
@@ -178,7 +178,7 @@
throwMathLibException("SubMatrix: colon wrong number of childs");
// evaluate new colon expression
- colonOp = colonOp.evaluate(null);
+ colonOp = colonOp.evaluate(null, globals);
if ( !(colonOp instanceof DoubleNumberToken))
throwMathLibException("SubMatrix: colon error wrong type");
@@ -280,7 +280,7 @@
throwMathLibException("SubMatrix: colon wrong number of childs");
// evaluate new colon expression
- colonOp = colonOp.evaluate(null);
+ colonOp = colonOp.evaluate(null, globals);
if ( !(colonOp instanceof DoubleNumberToken))
throwMathLibException("SubMatrix: colon error wrong type");
Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/submatrix.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/submatrix.java 2009-01-24 09:03:24 UTC (rev 740)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/submatrix.java 2009-01-24 09:10:55 UTC (rev 741)
@@ -34,7 +34,7 @@
then submatrix(a,:) return [1,2,3,4,5,6,7,8,9...]' column <br>
(also see subassign() )
*/
- public OperandToken evaluate(Token[] operands)
+ public OperandToken evaluate(Token[] operands, GlobalValues globals)
{
// at least two operands (e.g. submatrix(a,2) )
@@ -176,7 +176,7 @@
throwMathLibException("SubMatrix: colon wrong number of childs");
// evaluate new colon expression
- colonOp = colonOp.evaluate(null);
+ colonOp = colonOp.evaluate(null, globals);
if ( !(colonOp instanceof DoubleNumberToken))
throwMathLibException("SubMatrix: colon error wrong type");
@@ -334,7 +334,7 @@
throwMathLibException("SubMatrix: colon wrong number of childs");
// evaluate new colon expression
- colonOp = colonOp.evaluate(null);
+ colonOp = colonOp.evaluate(null, globals);
if ( !(colonOp instanceof DoubleNumberToken))
throwMathLibException("SubMatrix: colon error wrong type");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <st_...@us...> - 2009-01-24 09:03:26
|
Revision: 740
http://mathlib.svn.sourceforge.net/mathlib/?rev=740&view=rev
Author: st_mueller
Date: 2009-01-24 09:03:24 +0000 (Sat, 24 Jan 2009)
Log Message:
-----------
changed signature of evaluate(Token[] operands)
to
evaluate(Token[] operands, GlobalValues globals)
Modified Paths:
--------------
JMathLib/trunk/src/jmathlib/core/interpreter/Interpreter.java
Modified: JMathLib/trunk/src/jmathlib/core/interpreter/Interpreter.java
===================================================================
--- JMathLib/trunk/src/jmathlib/core/interpreter/Interpreter.java 2009-01-24 09:00:24 UTC (rev 739)
+++ JMathLib/trunk/src/jmathlib/core/interpreter/Interpreter.java 2009-01-24 09:03:24 UTC (rev 740)
@@ -1,4 +1,13 @@
-package jmathlib.core.interpreter;
+/*
+ * This file is part or JMathLib
+ *
+ * Check it out at http://www.jmathlib.de
+ *
+ * Author:
+ * (c) 2002-2009
+ */
+
+ package jmathlib.core.interpreter;
import jmathlib.core.tokens.*;
import jmathlib.core.tokens.numbertokens.DoubleNumberToken;
@@ -7,7 +16,7 @@
/**This is the main interface for the program. Any interface to the MathLib program would access
it through the functions exposed by this class.*/
-public class Interpreter extends RootObject
+public class Interpreter
{
/**Is the class being called from an application or an applet*/
boolean runningStandalone;
@@ -15,6 +24,9 @@
/**panel used for displaying text*/
private MathLibOutput outputPanel;
+ /**global pointers and values */
+ public GlobalValues globals = null;
+
/**for testing purposes additional throwing of errors can be enables */
public boolean throwErrorsB = false;
@@ -22,23 +34,27 @@
public Preferences prefs = new Preferences();
/**Constructs the interpreter and sets the constants
- @param _runningStandalone = true if this is being used from an application */
+ * @param _runningStandalone = true if this is being used from an application
+ */
public Interpreter(boolean _runningStandalone)
{
this(_runningStandalone, null);
}
/**Constructs the interpreter and sets the constants
- @param _runningStandalone = true if this is being used from an application
- @param _applet pointer to applet structure if this is an applet and not an
- application*/
+ * @param _runningStandalone = true if this is being used from an application
+ * @param _applet pointer to applet structure if this is an applet and not an
+ * application
+ */
public Interpreter(boolean _runningStandalone, Applet _applet)
{
runningStandalone = _runningStandalone;
- setConstants(runningStandalone, this, _applet);
+ // initialize global pointers, this pointer will be passed to
+ // all expressions for access to function manager, variable lists, contexts,...
+ globals = new GlobalValues(this, runningStandalone, _applet);;
- outputPanel = null;
+ outputPanel = null;
// read preferences from a file on the disc or on the web
prefs.loadPropertiesFromFile();
@@ -46,29 +62,33 @@
}
/**sets the panel to write any text to
- @param _outputPanel = the panel to write to, must implement the
- MathLibOutput interface*/
+ * @param _outputPanel = the panel to write to, must implement the
+ * MathLibOutput interface
+ */
public void setOutputPanel(MathLibOutput _outputPanel)
{
outputPanel = _outputPanel;
}
/**returns the panel to write any text to
- @return outputPanel = the panel to write to*/
+ * @return outputPanel = the panel to write to
+ */
public MathLibOutput getOutputPanel()
{
return outputPanel;
}
/**displays a string to the outputPanel
- @param text = the text to display*/
+ * @param text = the text to display
+ */
public void displayText(String text)
{
if(outputPanel != null)
outputPanel.displayText(text);
}
- /**saves the variable list*/
+ /**saves the variable list
+ */
public void save()
{
if(runningStandalone)
@@ -81,8 +101,9 @@
}
/**execute a single line.
- @param expression = the line to execute
- @return the result as a String*/
+ * @param expression = the line to execute
+ * @return the result as a String
+ */
public String executeExpression(String expression)
{
String answer = "";
@@ -91,7 +112,7 @@
// if required rehash m-files
if(runningStandalone)
{
- getFunctionManager().checkAndRehashTimeStamps();
+ globals.getFunctionManager().checkAndRehashTimeStamps();
}
try
@@ -105,7 +126,9 @@
// evaluate tree of expressions
OperandToken answerToken = null;
if (expressionTree!=null)
- answerToken = expressionTree.evaluate(null);
+ {
+ answerToken = expressionTree.evaluate(null, globals);
+ }
//getVariables().listVariables();
}
@@ -121,7 +144,7 @@
ErrorLogger.debugLine(answer);
// save last error to special variable
- Variable var = createVariable("lasterror");
+ Variable var = globals.createVariable("lasterror");
var.assign(new CharToken(answer));
// rethrow erros if enabled
@@ -140,7 +163,7 @@
}
// save last error to special variable
- Variable var = createVariable("lasterror");
+ Variable var = globals.createVariable("lasterror");
var.assign(new CharToken(answer));
}
@@ -149,13 +172,13 @@
}
/**get the real part of a scalar variable
- @param name = name of the scalar variable
- @return numerical value of the variable */
+ * @param name = name of the scalar variable
+ * @return numerical value of the variable
+ */
public double getScalarValueRe(String name)
{
// get variable from variable list
- //OperandToken variableData = getVariables().getVariable(name).getData();
- OperandToken variableData = getVariable(name).getData();
+ OperandToken variableData = globals.getVariable(name).getData();
// check if variable is already set
if (variableData == null) return 0.0;
@@ -173,13 +196,13 @@
}
/**get the imaginary part of a scalar variable
- @param name = name of the scalar variable
- @return numerical value of the variable */
+ * @param name = name of the scalar variable
+ * @return numerical value of the variable
+ */
public double getScalarValueIm(String name)
{
// get variable from variable list
- //OperandToken variableData = getVariables().getVariable(name).getData();
- OperandToken variableData = getVariable(name).getData();
+ OperandToken variableData = globals.getVariable(name).getData();
// check if variable is already set
if (variableData == null) return 0.0;
@@ -204,8 +227,7 @@
public boolean getScalarValueBoolean(String name)
{
// get variable from variable list
- //OperandToken variableData = getVariables().getVariable(name).getData();
- OperandToken variableData = getVariable(name).getData();
+ OperandToken variableData = globals.getVariable(name).getData();
// check if variable is already set
if (variableData == null) return false;
@@ -223,13 +245,13 @@
}
/**get the real values of a an array
- @param name = name of the array
- @return numerical value of the array */
+ * @param name = name of the array
+ * @return numerical value of the array
+ */
public double[][] getArrayValueRe(String name)
{
// get variable from variable list
- //OperandToken variableData = getVariables().getVariable(name).getData();
- OperandToken variableData = getVariable(name).getData();
+ OperandToken variableData = globals.getVariable(name).getData();
// check if variable is already set
if (variableData == null) return null;
@@ -244,13 +266,13 @@
}
/**get the imaginary values of a an array
- @param name = name of the array
- @return numerical value of the array */
+ * @param name = name of the array
+ * @return numerical value of the array
+ */
public double[][] getArrayValueIm(String name)
{
// get variable from variable list
- //OperandToken variableData = getVariables().getVariable(name).getData();
- OperandToken variableData = getVariable(name).getData();
+ OperandToken variableData = globals.getVariable(name).getData();
// check if variable is already set
if (variableData == null) return null;
@@ -272,8 +294,7 @@
public boolean[][] getArrayValueBoolean(String name)
{
// get variable from variable list
- //OperandToken variableData = getVariables().getVariable(name).getData();
- OperandToken variableData = getVariable(name).getData();
+ OperandToken variableData = globals.getVariable(name).getData();
// check if variable is already set
if (variableData == null) return null;
@@ -296,35 +317,34 @@
{
// Create variable. In case variable is already created it will
// return the current variable
- Variable answervar = createVariable(name);
+ Variable answervar = globals.createVariable(name);
// assign value to variable
answervar.assign(new DoubleNumberToken(valueRe, valueIm));
}
/** Store an array variable in jmathlib's workspace
- * @param name = name of the array
- * @param valueRe = real values of the array
- * @param valueIM = imaginary values of the array
- */
+ * @param name = name of the array
+ * @param valueRe = real values of the array
+ * @param valueIM = imaginary values of the array
+ */
public void setArray(String name, double[][] valueRe, double[][] valueIm)
{
// Create variable. In case variable is already created it will
// return the current variable
- Variable answervar = createVariable(name);
+ Variable answervar = globals.createVariable(name);
// assign value to variable
answervar.assign(new DoubleNumberToken(valueRe, valueIm));
}
/** Return the result of the last calculation
- * @return a string containing the last result
- */
+ * @return a string containing the last result
+ */
public String getResult()
{
// get variable from variable list
- //OperandToken variableData = getVariables().getVariable("ans").getData();
- OperandToken variableData = getVariable("ans").getData();
+ OperandToken variableData = globals.getVariable("ans").getData();
// check if variable is already set
if (variableData == null) return "";
@@ -333,13 +353,12 @@
}
/** Return the result of the last calculation
- * @return a string containing the last result
- */
+ * @return a string containing the last result
+ */
public String getString(String name)
{
- // get variable from variable list
- //OperandToken variableData = getVariables().getVariable(name).getData();
- OperandToken variableData = getVariable(name).getData();
+ // get variable from variable list
+ OperandToken variableData = globals.getVariable(name).getData();
// check if variable is already set
if (variableData == null) return "";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <st_...@us...> - 2009-01-24 09:00:26
|
Revision: 739
http://mathlib.svn.sourceforge.net/mathlib/?rev=739&view=rev
Author: st_mueller
Date: 2009-01-24 09:00:24 +0000 (Sat, 24 Jan 2009)
Log Message:
-----------
new toolbox /help
Added Paths:
-----------
JMathLib/trunk/src/jmathlib/toolbox/jmathlib/help/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <st_...@us...> - 2009-01-24 08:59:45
|
Revision: 738
http://mathlib.svn.sourceforge.net/mathlib/?rev=738&view=rev
Author: st_mueller
Date: 2009-01-24 08:59:43 +0000 (Sat, 24 Jan 2009)
Log Message:
-----------
this file is buggy: search for // stefan
Modified Paths:
--------------
JMathLib/trunk/src/jmathlib/tools/treeanalyser/TreeAnalyser.java
Modified: JMathLib/trunk/src/jmathlib/tools/treeanalyser/TreeAnalyser.java
===================================================================
--- JMathLib/trunk/src/jmathlib/tools/treeanalyser/TreeAnalyser.java 2009-01-24 08:56:25 UTC (rev 737)
+++ JMathLib/trunk/src/jmathlib/tools/treeanalyser/TreeAnalyser.java 2009-01-24 08:59:43 UTC (rev 738)
@@ -198,7 +198,8 @@
Function function = null;
try
{
- function = getFunctionManager().findFunction(func);
+ // stefan: this needs some work
+ //function = globals.getFunctionManager().findFunction(func);
}
catch(Exception exception)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <st_...@us...> - 2009-01-24 08:56:27
|
Revision: 737
http://mathlib.svn.sourceforge.net/mathlib/?rev=737&view=rev
Author: st_mueller
Date: 2009-01-24 08:56:25 +0000 (Sat, 24 Jan 2009)
Log Message:
-----------
added copyright notice
Modified Paths:
--------------
JMathLib/trunk/src/jmathlibtests/AllTests.java
JMathLib/trunk/src/jmathlibtests/toolbox/toolbox_skeleton/AllTests.java
JMathLib/trunk/src/jmathlibtests/toolbox/toolbox_skeleton/testTemplate.java
Modified: JMathLib/trunk/src/jmathlibtests/AllTests.java
===================================================================
--- JMathLib/trunk/src/jmathlibtests/AllTests.java 2009-01-24 08:55:19 UTC (rev 736)
+++ JMathLib/trunk/src/jmathlibtests/AllTests.java 2009-01-24 08:56:25 UTC (rev 737)
@@ -1,3 +1,12 @@
+/*
+ * This file is part or JMathLib
+ *
+ * Check it out at http://www.jmathlib.de
+ *
+ * Author: Stefan Mueller (st...@he...)
+ * (c) 2007, 2008, 2009
+ */
+
package jmathlibtests;
import jmathlib.tools.junit.framework.*;
Modified: JMathLib/trunk/src/jmathlibtests/toolbox/toolbox_skeleton/AllTests.java
===================================================================
--- JMathLib/trunk/src/jmathlibtests/toolbox/toolbox_skeleton/AllTests.java 2009-01-24 08:55:19 UTC (rev 736)
+++ JMathLib/trunk/src/jmathlibtests/toolbox/toolbox_skeleton/AllTests.java 2009-01-24 08:56:25 UTC (rev 737)
@@ -1,3 +1,12 @@
+/*
+ * This file is part or JMathLib
+ *
+ * Check it out at http://www.jmathlib.de
+ *
+ * Author: Stefan Mueller (st...@he...)
+ * (c) 2007, 2008, 2009
+ */
+
package jmathlibtests.toolbox.toolbox_skeleton;
import jmathlib.tools.junit.framework.*;
Modified: JMathLib/trunk/src/jmathlibtests/toolbox/toolbox_skeleton/testTemplate.java
===================================================================
--- JMathLib/trunk/src/jmathlibtests/toolbox/toolbox_skeleton/testTemplate.java 2009-01-24 08:55:19 UTC (rev 736)
+++ JMathLib/trunk/src/jmathlibtests/toolbox/toolbox_skeleton/testTemplate.java 2009-01-24 08:56:25 UTC (rev 737)
@@ -1,3 +1,12 @@
+/*
+ * This file is part or JMathLib
+ *
+ * Check it out at http://www.jmathlib.de
+ *
+ * Author: Stefan Mueller (st...@he...)
+ * (c) 2007, 2008, 2009
+ */
+
package jmathlibtests.toolbox.toolbox_skeleton;
import jmathlib.core.interpreter.Interpreter;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <st_...@us...> - 2009-01-24 08:55:21
|
Revision: 736
http://mathlib.svn.sourceforge.net/mathlib/?rev=736&view=rev
Author: st_mueller
Date: 2009-01-24 08:55:19 +0000 (Sat, 24 Jan 2009)
Log Message:
-----------
added more tests
Modified Paths:
--------------
JMathLib/trunk/src/jmathlibtests/toolbox/AllTests.java
Modified: JMathLib/trunk/src/jmathlibtests/toolbox/AllTests.java
===================================================================
--- JMathLib/trunk/src/jmathlibtests/toolbox/AllTests.java 2009-01-24 08:54:41 UTC (rev 735)
+++ JMathLib/trunk/src/jmathlibtests/toolbox/AllTests.java 2009-01-24 08:55:19 UTC (rev 736)
@@ -25,6 +25,7 @@
suite.addTest(jmathlibtests.toolbox.ftp.AllTests.suite());
suite.addTest(jmathlibtests.toolbox.funfun.AllTests.suite());
suite.addTest(jmathlibtests.toolbox.general.AllTests.suite());
+ suite.addTest(jmathlibtests.toolbox.help.AllTests.suite());
suite.addTest(jmathlibtests.toolbox.image.AllTests.suite());
//suite.addTest(jmathlibtests.toolbox.GuiTools.AllTests.suite());
suite.addTest(jmathlibtests.toolbox.io.AllTests.suite());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
155 messages has been excluded from this view by a project administrator.
