mathlib-commitlog Mailing List for JMathLib - Octave, Matlab clone in java (Page 9)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 710
          http://mathlib.svn.sourceforge.net/mathlib/?rev=710&view=rev
Author:   st_mueller
Date:     2009-01-21 19:30:34 +0000 (Wed, 21 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/adjoint.java
    JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/all.java
    JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/and.java
    JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/any.java
    JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/chol.java
    JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/cumprod.java
    JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/cumsum.java

Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/adjoint.java
===================================================================

--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/adjoint.java	2009-01-21 19:29:30 UTC (rev 709)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/adjoint.java	2009-01-21 19:30:34 UTC (rev 710)
@@ -6,13 +6,14 @@
 import jmathlib.core.tokens.FunctionToken;
 import jmathlib.core.functions.Function;
 import jmathlib.core.functions.ExternalFunction;
+import jmathlib.core.interpreter.GlobalValues;
 
 /**An external function for determining the determinant of a matrix*/
 public class adjoint 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;
 		
@@ -28,7 +29,7 @@
 		{
 			int size = matrix.getSizeX();
 			
-			result = new DoubleNumberToken(calcAdjoint(matrix.getReValues(), size));
+			result = new DoubleNumberToken(calcAdjoint(matrix.getReValues(), size, globals));
 		}
         else
         {
@@ -43,7 +44,7 @@
 	values = array of values
 	size   = the size of the matrix
 	result = the adjoint as a size * size array of double*/
-	private double[][] calcAdjoint(double[][] values, int size)
+	private double[][] calcAdjoint(double[][] values, int size, GlobalValues globals)
 	{
 		FunctionToken token = null;
 		Function function   = null;
@@ -51,7 +52,7 @@
 		try
 		{
 			token = new FunctionToken("Determinant");
-			function = getFunctionManager().findFunction(token);
+			function = globals.getFunctionManager().findFunction(token);
 		}
 		catch(java.lang.Exception e)
 		{}
@@ -67,7 +68,7 @@
 				operands[0] = subMatrix;
 
 								
-				double minor = ((DoubleNumberToken)function.evaluate(operands)).getValueRe();
+				double minor = ((DoubleNumberToken)function.evaluate(operands, globals)).getValueRe();
 				
 				int modifier = -1;
 				if((rowNumber + colNumber) % 2 == 0)

Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/all.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/all.java	2009-01-21 19:29:30 UTC (rev 709)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/all.java	2009-01-21 19:30:34 UTC (rev 710)
@@ -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 that return 1.0 is all elements of the argument are nonzero  */
 public class all extends ExternalFunction
@@ -12,7 +13,7 @@
 	/** 
 	* @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/and.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/and.java	2009-01-21 19:29:30 UTC (rev 709)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/and.java	2009-01-21 19:30:34 UTC (rev 710)
@@ -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 computing AND of two matrices        */
 public class and extends ExternalFunction
@@ -13,7 +14,7 @@
 	* @param operands[0] = matrix 
 	* @param operands[1] = matrix 
 	* @return matrix function AND of each element of the first and second argument  */
-	public OperandToken evaluate(Token[] operands)
+	public OperandToken evaluate(Token[] operands, GlobalValues globals)
 	{
 
 		// two operands (e.g. and(A,B) )

Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/any.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/any.java	2009-01-21 19:29:30 UTC (rev 709)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/any.java	2009-01-21 19:30:34 UTC (rev 710)
@@ -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 that return 1.0 is any element of the argument is nonzero  */
 public class any extends ExternalFunction
@@ -12,7 +13,7 @@
 	/**return a  matrix 
 	* @param operands[0] = matrix 
 	* @return 1.0 if any element of the argument is 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/chol.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/chol.java	2009-01-21 19:29:30 UTC (rev 709)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/chol.java	2009-01-21 19:30:34 UTC (rev 710)
@@ -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.CholeskyDecomposition;
 
 
@@ -12,7 +13,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. chol(A) )

Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/cumprod.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/cumprod.java	2009-01-21 19:29:30 UTC (rev 709)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/cumprod.java	2009-01-21 19:30:34 UTC (rev 710)
@@ -3,10 +3,11 @@
 import jmathlib.core.tokens.*;
 import jmathlib.core.tokens.numbertokens.DoubleNumberToken;
 import jmathlib.core.functions.ExternalFunction;
+import jmathlib.core.interpreter.GlobalValues;
 
 public class cumprod 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/cumsum.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/cumsum.java	2009-01-21 19:29:30 UTC (rev 709)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/cumsum.java	2009-01-21 19:30:34 UTC (rev 710)
@@ -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 cumsum extends ExternalFunction
 {
-	public OperandToken evaluate(Token[] operands)
+	public OperandToken evaluate(Token[] operands, GlobalValues globals)
 	{
 
 		if ((getNArgIn(operands) < 1) ||


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




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

mathlib-commitlog Mailing List for JMathLib - Octave, Matlab clone in java (Page 9)

mathlib-commitlog — log of all commits to CVS