[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] SF.net SVN: mathlib:[704] JMathLib/trunk/src/jmathlib/toolbox/jmathlib/ matrix
|
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.
|
