[Mathlib-commitlog] SF.net SVN: mathlib:[706] JMathLib/trunk/src/jmathlib/toolbox/jmathlib/ matrix

[<st_...@us...>]

Revision: 706
          http://mathlib.svn.sourceforge.net/mathlib/?rev=706&view=rev
Author:   st_mueller
Date:     2009-01-20 22:30:47 +0000 (Tue, 20 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/determinant.java
    JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/diag.java
    JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/eig.java
    JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/elementat.java
    JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/eye.java
    JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/find.java
    JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/fliplr.java
    JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/flipud.java
    JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/inf.java
    JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/inversematrix.java
    JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/isempty.java
    JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/isfinite.java
    JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/isimaginary.java
    JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/isinf.java
    JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/isnan.java
    JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/isreal.java

Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/determinant.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/determinant.java	2009-01-20 22:29:35 UTC (rev 705)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/determinant.java	2009-01-20 22:30:47 UTC (rev 706)
@@ -3,13 +3,14 @@
 import jmathlib.core.tokens.*;
 import jmathlib.core.tokens.numbertokens.DoubleNumberToken;
 import jmathlib.core.functions.ExternalFunction;
+import jmathlib.core.interpreter.GlobalValues;
 
 /**An external function for determining the determinant of a matrix*/
 public class determinant extends ExternalFunction
 {
 	/**Check that the parameter is a square matrix then claculate
 	it's determinant*/
-	public OperandToken evaluate(Token[] operands)
+	public OperandToken evaluate(Token[] operands, GlobalValues globals)
 	{
 		OperandToken result = null;
         

Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/diag.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/diag.java	2009-01-20 22:29:35 UTC (rev 705)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/diag.java	2009-01-20 22:30:47 UTC (rev 706)
@@ -3,11 +3,12 @@
 import jmathlib.core.tokens.*;
 import jmathlib.core.tokens.numbertokens.DoubleNumberToken;
 import jmathlib.core.functions.ExternalFunction;
+import jmathlib.core.interpreter.GlobalValues;
 
 /**An external function for computing a mesh of a matrix  */
 public class diag extends ExternalFunction
 {
-	public OperandToken evaluate(Token[] operands)
+	public OperandToken evaluate(Token[] operands, GlobalValues globals)
 	{
 
 		if ((getNArgIn(operands) < 1) ||

Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/eig.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/eig.java	2009-01-20 22:29:35 UTC (rev 705)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/eig.java	2009-01-20 22:30:47 UTC (rev 706)
@@ -3,6 +3,7 @@
 import jmathlib.core.tokens.*;
 import jmathlib.core.tokens.numbertokens.DoubleNumberToken;
 import jmathlib.core.functions.ExternalFunction;
+import jmathlib.core.interpreter.GlobalValues;
 import jmathlib.toolbox.jmathlib.matrix._private.Jama.EigenvalueDecomposition;
 
 /**An external function for computing eigenvalues and eigenvectors of an array  */
@@ -11,7 +12,7 @@
 	/**return a  matrix 
 	* @param operands[0] = matrix 
 	* @return matrix                                 */
-	public OperandToken evaluate(Token[] operands)
+	public OperandToken evaluate(Token[] operands, GlobalValues globals)
 	{
 
 		// one operand (e.g. eig(A) )

Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/elementat.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/elementat.java	2009-01-20 22:29:35 UTC (rev 705)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/elementat.java	2009-01-20 22:30:47 UTC (rev 706)
@@ -6,6 +6,7 @@
 import jmathlib.core.tokens.MatrixToken;
 import jmathlib.core.functions.ExternalFunction;
 import jmathlib.core.interpreter.Errors;
+import jmathlib.core.interpreter.GlobalValues;
 
 /**An external function to return the element at a certain point of a matrix*/
 public class elementat extends ExternalFunction
@@ -14,7 +15,7 @@
 	@param operands[0] = the matrix to sum
 	@param operands[1] = the row no
 	@param operands[2] = toe column no*/
-	public OperandToken evaluate(Token[] operands)
+	public OperandToken evaluate(Token[] operands, GlobalValues globals)
 	{
 		OperandToken result = null;
 		

Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/eye.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/eye.java	2009-01-20 22:29:35 UTC (rev 705)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/eye.java	2009-01-20 22:30:47 UTC (rev 706)
@@ -4,6 +4,7 @@
 import jmathlib.core.tokens.Token;
 import jmathlib.core.tokens.OperandToken;
 import jmathlib.core.functions.ExternalFunction;
+import jmathlib.core.interpreter.GlobalValues;
 
 /**An external function for creating matrices that consist of zeros          *
  * everywhere except in the diagonal. The diagonal consists of ones.         *                        
@@ -14,7 +15,7 @@
 	/**return a  matrix 
 	@param operands[0] = number of rows
 	@param operands[1] = number of columns */
-	public OperandToken evaluate(Token[] operands)
+	public OperandToken evaluate(Token[] operands, GlobalValues globals)
 	{
 
 		int columns;

Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/find.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/find.java	2009-01-20 22:29:35 UTC (rev 705)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/find.java	2009-01-20 22:30:47 UTC (rev 706)
@@ -5,6 +5,7 @@
 import jmathlib.core.tokens.LogicalToken;
 import jmathlib.core.tokens.numbertokens.DoubleNumberToken;
 import jmathlib.core.functions.ExternalFunction;
+import jmathlib.core.interpreter.GlobalValues;
 
 /**An external function for finding nonzero elements of a matrix    */
 public class find extends ExternalFunction
@@ -14,7 +15,7 @@
        (e.g. find([1,2,3;0,0,4]) returns [1,3,5,6]')
 	* @param  operands[0] = matrix 
 	* @return position of nonzero elements  */
-	public OperandToken evaluate(Token[] operands)
+	public OperandToken evaluate(Token[] operands, GlobalValues globals)
 	{
 
 		// Check number of arguments

Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/fliplr.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/fliplr.java	2009-01-20 22:29:35 UTC (rev 705)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/fliplr.java	2009-01-20 22:30:47 UTC (rev 706)
@@ -4,13 +4,14 @@
 import jmathlib.core.tokens.OperandToken;
 import jmathlib.core.tokens.numbertokens.DoubleNumberToken;
 import jmathlib.core.functions.ExternalFunction;
+import jmathlib.core.interpreter.GlobalValues;
 
 /**An external function for flipping matrices from left to right */
 public class fliplr extends ExternalFunction
 {
 	/**return a  matrix 
 	@param operands[0] = matrix to flip from left to right */
-	public OperandToken evaluate(Token[] operands)
+	public OperandToken evaluate(Token[] operands, GlobalValues globals)
 	{
 
 		// one operands (e.g. fliplr(A) )

Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/flipud.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/flipud.java	2009-01-20 22:29:35 UTC (rev 705)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/flipud.java	2009-01-20 22:30:47 UTC (rev 706)
@@ -4,13 +4,14 @@
 import jmathlib.core.tokens.OperandToken;
 import jmathlib.core.tokens.numbertokens.DoubleNumberToken;
 import jmathlib.core.functions.ExternalFunction;
+import jmathlib.core.interpreter.GlobalValues;
 
 /**An external function for flipping matrices from up to down */
 public class flipud extends ExternalFunction
 {
 	/**return a  matrix 
 	@param operands[0] = matrix to flip from up to down */
-	public OperandToken evaluate(Token[] operands)
+	public OperandToken evaluate(Token[] operands, GlobalValues globals)
 	{
 
 		// one operands (e.g. flipud(A) )

Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/inf.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/inf.java	2009-01-20 22:29:35 UTC (rev 705)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/inf.java	2009-01-20 22:30:47 UTC (rev 706)
@@ -4,13 +4,14 @@
 import jmathlib.core.tokens.Token;
 import jmathlib.core.tokens.OperandToken;
 import jmathlib.core.functions.ExternalFunction;
+import jmathlib.core.interpreter.GlobalValues;
 
 public class inf extends ExternalFunction
 {
 	/**return matrix of infinity
 	@param operands[0] = number of rows
 	@param operands[1] = number of columns */
-	public OperandToken evaluate(Token[] operands)
+	public OperandToken evaluate(Token[] operands, GlobalValues globals)
 	{
 
 		int columns;

Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/inversematrix.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/inversematrix.java	2009-01-20 22:29:35 UTC (rev 705)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/inversematrix.java	2009-01-20 22:30:47 UTC (rev 706)
@@ -6,6 +6,7 @@
 import jmathlib.core.tokens.MatrixToken;
 import jmathlib.core.functions.ExternalFunction;
 import jmathlib.core.interpreter.Errors;
+import jmathlib.core.interpreter.GlobalValues;
 import jmathlib.core.tokens.FunctionToken;
 import jmathlib.core.functions.Function;
 
@@ -16,7 +17,7 @@
 	it's inverse
 	It uses the Determinant and Adjoint classes to calculate the 
 	determinant and the adjoint*/
-	public OperandToken evaluate(Token[] operands)
+	public OperandToken evaluate(Token[] operands, GlobalValues globals)
 	{
 	    if (getNArgIn(operands) != 1)
 			throwMathLibException("InverseMatrix: number of arguments != 1");
@@ -39,7 +40,7 @@
 				try
 				{
 					token = new FunctionToken("Determinant");
-					determinant = getFunctionManager().findFunction(token);
+					determinant = globals.getFunctionManager().findFunction(token);
 				}
 				catch(java.lang.Exception e)
 				{}
@@ -47,16 +48,16 @@
 				try
 				{
 					token = new FunctionToken("Adjoint");
-					adjoint = getFunctionManager().findFunction(token);
+					adjoint = globals.getFunctionManager().findFunction(token);
 				}
 				catch(java.lang.Exception e)
 				{}
 			
-				double matrixDeterminant = ((DoubleNumberToken)determinant.evaluate(operands)).getValueRe();
+				double matrixDeterminant = ((DoubleNumberToken)determinant.evaluate(operands, globals)).getValueRe();
 				
 				if(matrixDeterminant != 0)
 				{
-					DoubleNumberToken matrixAdjoint = ((DoubleNumberToken)adjoint.evaluate(operands));
+					DoubleNumberToken matrixAdjoint = ((DoubleNumberToken)adjoint.evaluate(operands, globals));
 					
 					double[][] values = matrixAdjoint.getReValues();
 					

Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/isempty.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/isempty.java	2009-01-20 22:29:35 UTC (rev 705)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/isempty.java	2009-01-20 22:30:47 UTC (rev 706)
@@ -1,9 +1,9 @@
 package jmathlib.toolbox.jmathlib.matrix;
 
 import jmathlib.core.tokens.*;
-import jmathlib.core.tokens.OperandToken;
 import jmathlib.core.tokens.numbertokens.DoubleNumberToken;
 import jmathlib.core.functions.ExternalFunction;
+import jmathlib.core.interpreter.GlobalValues;
 
 /**An external function for checking if a matrix is empty (no number or string)  */
 public class isempty extends ExternalFunction
@@ -11,7 +11,7 @@
 	/**return a  matrix 
 	* @param  operands[0] = matrix 
 	* @return position of nonzero elements  */
-	public OperandToken evaluate(Token[] operands)
+	public OperandToken evaluate(Token[] operands, GlobalValues globals)
 	{
 
 		if (getNArgIn(operands) != 1)

Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/isfinite.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/isfinite.java	2009-01-20 22:29:35 UTC (rev 705)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/isfinite.java	2009-01-20 22:30:47 UTC (rev 706)
@@ -4,6 +4,7 @@
 import jmathlib.core.tokens.OperandToken;
 import jmathlib.core.tokens.numbertokens.DoubleNumberToken;
 import jmathlib.core.functions.ExternalFunction;
+import jmathlib.core.interpreter.GlobalValues;
 
 /**An external function that return 1.0 is all elements of the argument are nonzero  */
 public class isfinite extends ExternalFunction
@@ -11,7 +12,7 @@
 	/**return a  matrix 
 	* @param operands[0] = matrix 
 	* @return 1.0 if all elements of the argument are nonzero  */
-	public OperandToken evaluate(Token[] operands)
+	public OperandToken evaluate(Token[] operands, GlobalValues globals)
 	{
 
 		// two operands (e.g. not(A) )

Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/isimaginary.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/isimaginary.java	2009-01-20 22:29:35 UTC (rev 705)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/isimaginary.java	2009-01-20 22:30:47 UTC (rev 706)
@@ -4,6 +4,7 @@
 import jmathlib.core.tokens.OperandToken;
 import jmathlib.core.tokens.numbertokens.DoubleNumberToken;
 import jmathlib.core.functions.ExternalFunction;
+import jmathlib.core.interpreter.GlobalValues;
 
 /**An external function that return 1.0 is real elements of the argument are zero  */
 public class isimaginary extends ExternalFunction
@@ -11,7 +12,7 @@
 	/**return a  matrix 
 	* @param operands[0] = matrix 
 	* @return 1.0 if all elements of the argument are nonzero  */
-	public OperandToken evaluate(Token[] operands)
+	public OperandToken evaluate(Token[] operands, GlobalValues globals)
 	{
 
 		// two operands (e.g. not(A) )

Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/isinf.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/isinf.java	2009-01-20 22:29:35 UTC (rev 705)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/isinf.java	2009-01-20 22:30:47 UTC (rev 706)
@@ -4,6 +4,7 @@
 import jmathlib.core.tokens.OperandToken;
 import jmathlib.core.tokens.numbertokens.DoubleNumberToken;
 import jmathlib.core.functions.ExternalFunction;
+import jmathlib.core.interpreter.GlobalValues;
 
 /**An external function that return 1.0 is all elements of the argument are nonzero  */
 public class isinf extends ExternalFunction
@@ -11,7 +12,7 @@
 	/**return a  matrix 
 	* @param operands[0] = matrix 
 	* @return 1.0 if all elements of the argument are nonzero  */
-	public OperandToken evaluate(Token[] operands)
+	public OperandToken evaluate(Token[] operands, GlobalValues globals)
 	{
 
 		// two operands (e.g. not(A) )

Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/isnan.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/isnan.java	2009-01-20 22:29:35 UTC (rev 705)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/isnan.java	2009-01-20 22:30:47 UTC (rev 706)
@@ -4,6 +4,7 @@
 import jmathlib.core.tokens.OperandToken;
 import jmathlib.core.tokens.numbertokens.DoubleNumberToken;
 import jmathlib.core.functions.ExternalFunction;
+import jmathlib.core.interpreter.GlobalValues;
 
 /**An external function that return 1.0 is all elements of the argument are nonzero  */
 public class isnan extends ExternalFunction
@@ -11,7 +12,7 @@
 	/**return a  matrix 
 	* @param operands[0] = matrix 
 	* @return 1.0 if all elements of the argument are nonzero  */
-	public OperandToken evaluate(Token[] operands)
+	public OperandToken evaluate(Token[] operands, GlobalValues globals)
 	{
 
 		// two operands (e.g. not(A) )

Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/isreal.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/isreal.java	2009-01-20 22:29:35 UTC (rev 705)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/isreal.java	2009-01-20 22:30:47 UTC (rev 706)
@@ -4,6 +4,7 @@
 import jmathlib.core.tokens.Token;
 import jmathlib.core.tokens.OperandToken;
 import jmathlib.core.functions.ExternalFunction;
+import jmathlib.core.interpreter.GlobalValues;
 
 /**An external function that return 1.0 is all elements of the argument are non imaginary  */
 public class isreal extends ExternalFunction
@@ -11,7 +12,7 @@
 	/**return a  matrix 
 	* @param operands[0] = matrix 
 	* @return 1.0 if all elements of the argument are nonzero  */
-	public OperandToken evaluate(Token[] operands)
+	public OperandToken evaluate(Token[] operands, GlobalValues globals)
 	{
 
 		// two operands (e.g. not(A) )


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.