Thread: [Mathlib-commitlog] SF.net SVN: mathlib:[704] JMathLib/trunk/src/jmathlib/toolbox/jmathlib/ matrix
Status: Beta
Brought to you by:
st_mueller
Menu
▾
▴
mathlib-commitlog
|
From: <st_...@us...> - 2009-01-20 22:29:50
|
Revision: 704
http://mathlib.svn.sourceforge.net/mathlib/?rev=704&view=rev
Author: st_mueller
Date: 2009-01-20 22:20:08 +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/lowertriangle.java
JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/lu.java
JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/magic.java
JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/max.java
JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/min.java
JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/nan.java
JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/nnz.java
JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/not.java
JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/numel.java
JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/ones.java
JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/or.java
JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/pow2.java
JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/prod.java
JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/qr.java
JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/repmat.java
JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/reshape.java
JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/simultaneouseq.java
JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/sort.java
Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/lowertriangle.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/lowertriangle.java 2009-01-20 20:22:19 UTC (rev 703)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/lowertriangle.java 2009-01-20 22:20:08 UTC (rev 704)
@@ -4,12 +4,13 @@
import jmathlib.core.tokens.Token;
import jmathlib.core.tokens.OperandToken;
import jmathlib.core.functions.ExternalFunction;
+import jmathlib.core.interpreter.GlobalValues;
/**An external function for converting a matrix into lower
triangular form*/
public class lowertriangle extends ExternalFunction
{
- public OperandToken evaluate(Token[] operands)
+ public OperandToken evaluate(Token[] operands, GlobalValues globals)
{
OperandToken result = null;
Token operand = operands[0];
Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/lu.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/lu.java 2009-01-20 20:22:19 UTC (rev 703)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/lu.java 2009-01-20 22:20:08 UTC (rev 704)
@@ -5,6 +5,7 @@
import jmathlib.core.tokens.OperandToken;
import jmathlib.core.tokens.MatrixToken;
import jmathlib.core.functions.ExternalFunction;
+import jmathlib.core.interpreter.GlobalValues;
import jmathlib.toolbox.jmathlib.matrix._private.Jama.LUDecomposition;
@@ -32,7 +33,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/magic.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/magic.java 2009-01-20 20:22:19 UTC (rev 703)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/magic.java 2009-01-20 22:20:08 UTC (rev 704)
@@ -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 calculating a magic matrix */
/* The function has been taken from the JAMA-examples */
@@ -11,7 +12,7 @@
{
/**return a matrix
@param operands[0] = dimension of magic matrix */
- public OperandToken evaluate(Token[] operands)
+ public OperandToken evaluate(Token[] operands, GlobalValues globals)
{
// one operands (e.g. magic(n) )
Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/max.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/max.java 2009-01-20 20:22:19 UTC (rev 703)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/max.java 2009-01-20 22:20:08 UTC (rev 704)
@@ -2,15 +2,15 @@
import jmathlib.core.tokens.numbertokens.DoubleNumberToken;
import jmathlib.core.tokens.*;
-import jmathlib.core.tokens.OperandToken;
import jmathlib.core.functions.ExternalFunction;
+import jmathlib.core.interpreter.GlobalValues;
public class max extends ExternalFunction
{
/**return a matrix
* @param operands[0] = matrix
* @return maximum of all 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/min.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/min.java 2009-01-20 20:22:19 UTC (rev 703)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/min.java 2009-01-20 22:20:08 UTC (rev 704)
@@ -2,8 +2,8 @@
import jmathlib.core.tokens.numbertokens.DoubleNumberToken;
import jmathlib.core.tokens.*;
-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 nonzero */
public class min extends ExternalFunction
@@ -11,7 +11,7 @@
/**return a matrix
* @param operands[0] = matrix
* @return minimum of all 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/nan.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/nan.java 2009-01-20 20:22:19 UTC (rev 703)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/nan.java 2009-01-20 22:20:08 UTC (rev 704)
@@ -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 nan extends ExternalFunction
{
/**return matrix of NaN
@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/nnz.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/nnz.java 2009-01-20 20:22:19 UTC (rev 703)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/nnz.java 2009-01-20 22:20:08 UTC (rev 704)
@@ -5,6 +5,7 @@
import jmathlib.core.tokens.OperandToken;
import jmathlib.core.functions.ExternalFunction;
import jmathlib.core.interpreter.Errors;
+import jmathlib.core.interpreter.GlobalValues;
/**An external function for determining number of non zero elements in a matrix*/
public class nnz extends ExternalFunction
@@ -12,7 +13,7 @@
/**Calculate number of non zero elements
@param operands[0] = the matrix
@return the number of non zero elements*/
- public OperandToken evaluate(Token[] operands)
+ public OperandToken evaluate(Token[] operands, GlobalValues globals)
{
int count = 0;
Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/not.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/not.java 2009-01-20 20:22:19 UTC (rev 703)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/not.java 2009-01-20 22:20:08 UTC (rev 704)
@@ -5,6 +5,7 @@
import jmathlib.core.tokens.OperandToken;
import jmathlib.core.tokens.LogicalToken;
import jmathlib.core.functions.ExternalFunction;
+import jmathlib.core.interpreter.GlobalValues;
/**An external function for computing NOT a matrix */
public class not extends ExternalFunction
@@ -12,7 +13,7 @@
/**return a matrix
* @param operands[0] = matrix
* @return matrix function NOT of each element */
- 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/numel.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/numel.java 2009-01-20 20:22:19 UTC (rev 703)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/numel.java 2009-01-20 22:20:08 UTC (rev 704)
@@ -5,12 +5,13 @@
import jmathlib.core.tokens.OperandToken;
import jmathlib.core.tokens.DataToken;
import jmathlib.core.functions.ExternalFunction;
+import jmathlib.core.interpreter.GlobalValues;
/**number of elements */
public class numel extends ExternalFunction
{
/** */
- 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/ones.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/ones.java 2009-01-20 20:22:19 UTC (rev 703)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/ones.java 2009-01-20 22:20:08 UTC (rev 704)
@@ -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 ones */
/* (e.g.: ones(2) will return a 2-by-2 matrix [1,2;1,1], *
@@ -13,7 +14,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)
{
// at least one operand
Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/or.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/or.java 2009-01-20 20:22:19 UTC (rev 703)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/or.java 2009-01-20 22:20:08 UTC (rev 704)
@@ -5,6 +5,7 @@
import jmathlib.core.tokens.OperandToken;
import jmathlib.core.tokens.LogicalToken;
import jmathlib.core.functions.ExternalFunction;
+import jmathlib.core.interpreter.GlobalValues;
/**An external function for computing Or of two matrices */
public class or extends ExternalFunction
@@ -13,7 +14,7 @@
* @param operands[0] = matrix
* @param operands[1] = matrix
* @return matrix function OR 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. or(A,B) )
Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/pow2.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/pow2.java 2009-01-20 20:22:19 UTC (rev 703)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/pow2.java 2009-01-20 22:20:08 UTC (rev 704)
@@ -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 computing 2 raised to the power of each *
* element of an array */
@@ -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. pow2(A) )
Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/prod.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/prod.java 2009-01-20 20:22:19 UTC (rev 703)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/prod.java 2009-01-20 22:20:08 UTC (rev 704)
@@ -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 computing the product of array ellements */
public class prod extends ExternalFunction
@@ -11,7 +12,7 @@
/**return a matrix
* @param operands[0] = matrix
* @return scalar or vector */
- public OperandToken evaluate(Token[] operands)
+ public OperandToken evaluate(Token[] operands, GlobalValues globals)
{
// one operand (e.g. prod(A) )
Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/qr.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/qr.java 2009-01-20 20:22:19 UTC (rev 703)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/qr.java 2009-01-20 22:20:08 UTC (rev 704)
@@ -5,6 +5,7 @@
import jmathlib.core.tokens.OperandToken;
import jmathlib.core.tokens.MatrixToken;
import jmathlib.core.functions.ExternalFunction;
+import jmathlib.core.interpreter.GlobalValues;
import jmathlib.toolbox.jmathlib.matrix._private.Jama.QRDecomposition;
/** QR Decomposition.
@@ -26,7 +27,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. qr(A) )
Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/repmat.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/repmat.java 2009-01-20 20:22:19 UTC (rev 703)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/repmat.java 2009-01-20 22:20:08 UTC (rev 704)
@@ -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 replicating and tiling matrices *
* (e.g. remat(a, m, n) creates a large matrix that consists of *
@@ -15,7 +16,7 @@
* @param operands[1] = number of rows
* @param operands[2] = number of columns
* @return big matrix */
- public OperandToken evaluate(Token[] operands)
+ public OperandToken evaluate(Token[] operands, GlobalValues globals)
{
// two operands (e.g. reshape(A,[n,m]) ) or
Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/reshape.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/reshape.java 2009-01-20 20:22:19 UTC (rev 703)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/reshape.java 2009-01-20 22:20:08 UTC (rev 704)
@@ -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 for reshaping matrices *
* (e.g. reshape([1,2;3,4;5,6],2,3) return [1,5,4;3,2,6]) *
@@ -15,7 +16,7 @@
@param operands[0] = matrix to reshape
@param operands[1] = number of rows
@param operands[2] = number of columns */
- public OperandToken evaluate(Token[] operands)
+ public OperandToken evaluate(Token[] operands, GlobalValues globals)
{
// three operands (e.g. reshape(A,n,m) )
Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/simultaneouseq.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/simultaneouseq.java 2009-01-20 20:22:19 UTC (rev 703)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/simultaneouseq.java 2009-01-20 22:20:08 UTC (rev 704)
@@ -2,6 +2,7 @@
import jmathlib.core.tokens.*;
import jmathlib.core.functions.ExternalFunction;
+import jmathlib.core.interpreter.GlobalValues;
/**An external function for determining the determinant of a matrix*/
public class simultaneouseq extends ExternalFunction
@@ -11,15 +12,15 @@
operands[0] = m*m matrix of co-efficients
operands[1] = m*1 matrix of sums
result = m*1 matrix of solutions*/
- public OperandToken evaluate(Token[] operands)
+ public OperandToken evaluate(Token[] operands, GlobalValues globals)
{
inversematrix inverse = new inversematrix();
- OperandToken inv = inverse.evaluate(new Token[] {operands[0]});
+ OperandToken inv = inverse.evaluate(new Token[] {operands[0]}, globals);
Expression exp = new Expression(new MulDivOperatorToken('*'), ((OperandToken)operands[1]), inv);
- return exp.evaluate(null);
+ return exp.evaluate(null, globals);
}
}
Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/sort.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/sort.java 2009-01-20 20:22:19 UTC (rev 703)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/sort.java 2009-01-20 22:20:08 UTC (rev 704)
@@ -5,12 +5,13 @@
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 sorting arrays */
public class sort extends ExternalFunction
{
/** sorting vectors and arrays */
- public OperandToken evaluate(Token[] operands)
+ public OperandToken evaluate(Token[] operands, GlobalValues globals)
{
// Check number of arguments
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <st_...@us...> - 2009-01-20 22:29:47
|
Revision: 705
http://mathlib.svn.sourceforge.net/mathlib/?rev=705&view=rev
Author: st_mueller
Date: 2009-01-20 22:29:35 +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/sum.java
JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/svd.java
JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/uppertriangle.java
JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/xor.java
JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/zeros.java
Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/sum.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/sum.java 2009-01-20 22:20:08 UTC (rev 704)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/sum.java 2009-01-20 22:29:35 UTC (rev 705)
@@ -5,6 +5,7 @@
import jmathlib.core.tokens.OperandToken;
import jmathlib.core.tokens.numbertokens.DoubleNumberToken;
import jmathlib.core.functions.ExternalFunction;
+import jmathlib.core.interpreter.GlobalValues;
import jmathlib.core.interpreter.Variable;
import java.util.*;
@@ -15,7 +16,7 @@
{
/**Calculate the sum of the values within a matrix or structure
@param operands[0] = the matrix or structure to sum*/
- public OperandToken evaluate(Token[] operands)
+ public OperandToken evaluate(Token[] operands, GlobalValues globals)
{
OperandToken result = null;
Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/svd.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/svd.java 2009-01-20 22:20:08 UTC (rev 704)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/svd.java 2009-01-20 22:29:35 UTC (rev 705)
@@ -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.SingularValueDecomposition;
/** Singular Value Decomposition.
@@ -28,7 +29,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/uppertriangle.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/uppertriangle.java 2009-01-20 22:20:08 UTC (rev 704)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/uppertriangle.java 2009-01-20 22:29:35 UTC (rev 705)
@@ -4,12 +4,13 @@
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 converting a matrix into upper
triangular form*/
public class uppertriangle extends ExternalFunction
{
- public OperandToken evaluate(Token[] operands)
+ public OperandToken evaluate(Token[] operands, GlobalValues globals)
{
OperandToken result = null;
Token operand = operands[0];
Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/xor.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/xor.java 2009-01-20 22:20:08 UTC (rev 704)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/xor.java 2009-01-20 22:29:35 UTC (rev 705)
@@ -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 for computing XOr of two matrices */
public class xor extends ExternalFunction
@@ -12,7 +13,7 @@
* @param operands[0] = matrix
* @param operands[1] = matrix
* @return matrix XOr 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. xor(A,B) )
Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/zeros.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/zeros.java 2009-01-20 22:20:08 UTC (rev 704)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/matrix/zeros.java 2009-01-20 22:29:35 UTC (rev 705)
@@ -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 for creating matrices that consist of zeros *
* (e.g.: zeros(2) will return a 2-by-2 matrix [0,0;0,0], *
@@ -13,7 +14,7 @@
/**return matrix of zeros
@param operands[0] = number of rows
@param operands[1] = number of columns */
- public OperandToken evaluate(Token[] operands)
+ public OperandToken evaluate(Token[] operands, GlobalValues globals)
{
// at least one operands (e.g. zeros(n) )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <st_...@us...> - 2009-01-20 22:30:55
|
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.
|
|
From: <st_...@us...> - 2009-01-21 19:30:36
|
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.
|
|
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.
|
Thanks for helping keep SourceForge clean.
X