[Mathlib-commitlog] SF.net SVN: mathlib:[741] JMathLib/trunk/src/jmathlib/toolbox/jmathlib/ matrix
Status: Beta
Brought to you by:
st_mueller
|
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.
|