[Mathlib-commitlog] SF.net SVN: mathlib:[614] JMathLib/trunk/src/jmathlib/core/interpreter/ Interpreter.java

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

Revision: 614
          http://mathlib.svn.sourceforge.net/mathlib/?rev=614&view=rev
Author:   st_mueller
Date:     2009-01-05 14:57:06 +0000 (Mon, 05 Jan 2009)

Log Message:
-----------
changed handling of global variables

Modified Paths:
--------------
    JMathLib/trunk/src/jmathlib/core/interpreter/Interpreter.java

Modified: JMathLib/trunk/src/jmathlib/core/interpreter/Interpreter.java
===================================================================
--- JMathLib/trunk/src/jmathlib/core/interpreter/Interpreter.java	2009-01-05 13:07:14 UTC (rev 613)
+++ JMathLib/trunk/src/jmathlib/core/interpreter/Interpreter.java	2009-01-05 14:57:06 UTC (rev 614)
@@ -121,7 +121,7 @@
             ErrorLogger.debugLine(answer);
         	
             // save last error to special variable
-            Variable var = getVariables().createVariable("lasterror");
+            Variable var = createVariable("lasterror");
 	        var.assign(new CharToken(answer));
             
 	        // rethrow erros if enabled
@@ -140,7 +140,7 @@
             }
 
             // save last error to special variable
-            Variable var = getVariables().createVariable("lasterror");
+            Variable var = createVariable("lasterror");
             var.assign(new CharToken(answer));	
         }
 
@@ -287,32 +287,39 @@
         return l.getValues();
     }
 
-    /** store a scalar variable in mathlib's workspace
+    /** store a scalar variable in jmathlib's workspace
      * @param name    = name of the scalar
      * @param valueRe = real value of the scalar
      * @param valueIM = imaginary value of the scalar
      */
     public void setScalar(String name, double valueRe, double valueIm)
     {
-        Variable answervar = getVariables().createVariable(name);
+        // Create variable. In case variable is already created it will
+        // return the current variable
+        Variable answervar =  createVariable(name);
 
+        // assign value to variable
         answervar.assign(new DoubleNumberToken(valueRe, valueIm));
     }
     
-    /** store an array variable in mathlib's workspace
-    @param name    = name of the array
-    @param valueRe = real values of the array
-    @param valueIM = imaginary values of the array
+    /** Store an array variable in jmathlib's workspace
+    * @param name    = name of the array
+    * @param valueRe = real values of the array
+    * @param valueIM = imaginary values of the array
     */
     public void setArray(String name, double[][] valueRe, double[][] valueIm)
     {
-        Variable answervar = getVariables().createVariable(name);
+        // Create variable. In case variable is already created it will
+        // return the current variable
+        Variable answervar = createVariable(name);
 
+        // assign value to variable
         answervar.assign(new DoubleNumberToken(valueRe, valueIm));
     }
 
-    /**return the result of the last calculation
-    @return a string containing the last result*/
+    /** Return the result of the last calculation
+    * @return a string containing the last result
+    */
     public String getResult()
     {
         // get variable from variable list		 
@@ -325,8 +332,9 @@
         return variableData.toString();               
     }
 
-    /**return the result of the last calculation
-    @return a string containing the last result*/
+    /** Return the result of the last calculation
+    * @return a string containing the last result
+    */
     public String getString(String name)
     {
         //      get variable from variable list      


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