Changeset 202

Timestamp:

08/08/08 11:03:47 (16 years ago)

Author:

ra33

Message:

Fixed problem with Simple CalculateString command

Location:

trunk/src/org/expeditee

Files:

• actions/Simple.java (modified) (4 diffs)
• gui/DisplayIO.java (modified) (1 diff)
• math/ExpediteeJEP.java (modified) (5 diffs)
• simple/Primitives.java (modified) (1 diff)

trunk/src/org/expeditee/actions/Simple.java

@@ -325 +325 @@
         }
 
-        private static void RunFrame(Frame frame, Text current, boolean acceptKeyboardInput,
-                        boolean step, int pause, Color color) {
+        private static void RunFrame(Frame frame, Text current,
+                        boolean acceptKeyboardInput, boolean step, int pause, Color color) {
                 try {
                         DisplayIO.addToBack(current.getParent());
@@ -354 +354 @@
         }
 
-        public static void RunFrame(Frame frame, Text current, boolean acceptKeyboardInput) {
+        public static void RunFrame(Frame frame, Text current,
+                        boolean acceptKeyboardInput) {
                 RunFrame(frame, current, acceptKeyboardInput, false, 0, null);
         }
@@ -368 +369 @@
          * @param pause
          */
-        public static void DebugFrame(Frame frame, Text current, float pause, Color color) {
+        public static void DebugFrame(Frame frame, Text current, float pause,
+                        Color color) {
                 if (isProgramRunning()) {
                         stop();
@@ -794 +796 @@
                         // Add the variables in the system
                         context.getPrimitives().addToParser(myParser);
-                        Node equation = myParser.parseExpression(toCalculate);
-                        // TODO get the answer
-                        if (equation == null) {
+                        try {
+                                Node equation = myParser.parse(toCalculate);
+                                String value = myParser.evaluate(equation, false);
+                                // Add a new variable if its an assignment statement
+                                String newVar = SReal.prefix + myParser.getNewVariable();
+                                if (newVar.length() > 0) {
+                                        try {
+                                                context.getPrimitives().setValue(newVar,
+                                                                new SString(value));
+                                        } catch (IncorrectTypeException e) {
+                                                result = false;
+                                                error = e.getMessage();
+                                        }
+                                }
+                                if (tokens.length > 2) {
+                                        context.getPrimitives().setValue(tokens[2],
+                                                        new SString(value));
+                                }
+                                // TODO get the answer
+                        } catch (Throwable e) {
                                 result = false;
-                                error = myParser.getErrorInfo().replace("\n", "");
-                        } else {
-                                double value = myParser.getValue();
-                                if (myParser.hasError()) {
-                                        result = false;
+                                if (myParser.getErrorInfo() == null) {
+                                        error = e.getMessage();
+                                } else {
                                         error = myParser.getErrorInfo().replace("\n", "");
-                                } else {
-                                        // Add a new variable if its an assignment statement
-                                        String newVar = myParser.getNewVariable();
-                                        if (newVar.length() > 0) {
-                                                try {
-                                                        context.getPrimitives().setValue(newVar,
-                                                                        new SReal(value));
-                                                } catch (IncorrectTypeException e) {
-                                                        result = false;
-                                                        error = e.getMessage();
-                                                }
-                                        }
-                                        if (tokens.length > 2) {
-                                                context.getPrimitives().setValue(tokens[2],
-                                                                new SReal(value));
-                                        }
                                 }
                         }

trunk/src/org/expeditee/gui/DisplayIO.java

@@ -65 +65 @@
          * The title to display in the Title bar.
          */
-        public static final String TITLE = "Exp07Aug2008A";
+        public static final String TITLE = "Exp08Aug2008A";
 
         private DisplayIO() {

trunk/src/org/expeditee/math/ExpediteeJEP.java

@@ -50 +50 @@
         }
 
-        public String evaluate(Node node) throws ParseException{
+        public String evaluate(Node node) throws ParseException {
+                return evaluate(node, true);
+        }
+
+        public String evaluate(Node node, boolean prependVarName)
+                        throws ParseException {
                 Object rawResult = super.evaluate(node);
                 if (rawResult instanceof Double) {
-                        Double result = (Double)rawResult;
+                        Double result = (Double) rawResult;
                         if (result.isNaN()) {
                                 return null;
@@ -64 +69 @@
                         String varName = observer.toString();
                         if (varName.length() > 0)
-                                return varName + ": " + nf.format(result);
+                                return (prependVarName ? (varName + ": ") : "")
+                                                + nf.format(result);
 
                         return nf.format(result);
@@ -88 +94 @@
                                                 frame, t.getEnclosedShape());
                                 String variableName = t.getText().toLowerCase();
-                                
+
                                 addVectorVariable(enclosed, variableName);
                         }
@@ -102 +108 @@
                 for (Item i : items) {
                         if (i instanceof Text && !i.isLineEnd()) {
-                                Double value = AttributeUtils.getDoubleValue(i
-                                                .getText());
+                                Double value = AttributeUtils.getDoubleValue(i.getText());
                                 if (value != null) {
                                         vector.add(value);
@@ -110 +115 @@
                 }
                 if (vector.size() > 0)
-                        addVariable(variableName, MVector
-                                        .getInstance(vector.toArray()));
+                        addVariable(variableName, MVector.getInstance(vector.toArray()));
         }
 

trunk/src/org/expeditee/simple/Primitives.java

@@ -272 +272 @@
                         try {
                                 Double value = var.doubleValue();
-                                myParser.addVariable(var.getName(), value);
+                                myParser.addVariable(var.getName().substring(SReal.prefix.length()), value);
                         } catch (Exception e) {
                         }