Changeset 86 for trunk/src/org/expeditee/actions

Timestamp:

06/05/08 10:11:18 (16 years ago)

Author:

ra33

Message:

Added DebugFrame action
Added GetCometStats
Lots of bug fixes

Location:

trunk/src/org/expeditee/actions

Files:

• Actions.java (modified) (8 diffs)
• Misc.java (modified) (7 diffs)
• Simple.java (modified) (20 diffs)

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

@@ -46 +46 @@
 public class Actions {
 
+        private static final String INVALID_PARAMETERS_ERROR = "Invalid parameters for agent: "; //$NON-NLS-1$
+
         // the currently running agent (if there is one)
         private static Agent _Agent = null;
@@ -164 +166 @@
          * Clears out the Action and JAG Hashtables and refills them. Normally this
          * is only called once when the system starts.
-         * @return a warning message if there were any problems loading agents or actions.
+         * 
+         * @return a warning message if there were any problems loading agents or
+         *         actions.
          */
         public static Collection<String> Init() {
                 Collection<String> warnings = new LinkedList<String>();
                 Class[] classes;
-                
+
                 try {
                         classes = getClasses(AGENTS_PACKAGE);
@@ -327 +331 @@
 
                 for (Method possible : possibles) {
-
                         // try first with the launching item as a parameter
 
@@ -346 +349 @@
                                 e.printStackTrace();
                         }
+                }
+                if (possibles.size() > 0) {
+                        FrameGraphics.ErrorMessage("Incorrect parameters for " + mname);
+                } else {
+                        assert(false);
+                        FrameGraphics.ErrorMessage(mname + " action not found");
                 }
         }
@@ -386 +395 @@
                         // get the constructor for the JAG class
                         Constructor con = null;
-                        Constructor constructors[] = agentClass.getConstructors();
+                        Constructor[] constructors = agentClass.getConstructors();
                         Object[] params = null;
 
@@ -397 +406 @@
                                         params[0] = parameters;
                                         break;
-                                } else if (c.getParameterTypes().length == 0 && con == null)
+                                } else if (c.getParameterTypes().length == 0 && con == null) {
                                         con = c;
+                                }
                         }
 
                         // if there is no constructor, return
                         if (con == null) {
-                                FrameGraphics.DisplayMessage("Invalid parametres for agent: "
+                                FrameGraphics.DisplayMessage(INVALID_PARAMETERS_ERROR
                                                 + nameWithCorrectCase);
                                 // System.out.println("Constructor not found...");
@@ -433 +443 @@
 
                 } catch (ClassNotFoundException cnf) {
-                        FrameGraphics.ErrorMessage("Error: '" + nameWithCorrectCase
+                        FrameGraphics.ErrorMessage(nameWithCorrectCase
                                         + "' is not an action or agent.");
                 } catch (Exception e) {
@@ -540 +550 @@
                         }
                         // convert the value to an object
-                        Object o = Conversion.Convert(paramTypes[ind], param);
-                        if (o == null)
+                        try {
+                                Object o = Conversion.Convert(paramTypes[ind], param);
+                                if (o == null)
+                                        return null;
+                                objects[ind] = o;
+                        } catch (Exception e) {
                                 return null;
-                        objects[ind] = o;
+                        }
                 }
 

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

@@ -11 +11 @@
 import java.io.IOException;
 import java.lang.reflect.Method;
+import java.sql.Time;
 import java.util.ArrayList;
 import java.util.List;
@@ -22 +23 @@
 import org.expeditee.gui.FrameMouseActions;
 import org.expeditee.gui.TimeKeeper;
+import org.expeditee.io.Logger;
 import org.expeditee.items.Item;
 import org.expeditee.items.Text;
@@ -54 +56 @@
         public static void Restore() {
                 FrameIO.Reload();
-
-                FrameGraphics.DisplayMessage("Restoration complete.");
+                //FrameGraphics.DisplayMessage("Restoration complete.");
         }
 
@@ -227 +228 @@
         }
 
+        /**
+         * Creates a new Text Object containing statistics for the current tree.
+         */
+        public static void GetCometStats(Frame frame) {
+                FrameGraphics.DisplayMessage("Extracting comet stats...");
+
+                StringBuffer sb = new StringBuffer();
+                Time active = frame.getCometActiveTime(true);
+                Time dark = frame.getCometDarkTime(true);
+                Time total = new Time(active.getTime() + dark.getTime());
+                int length = frame.getCometLength();
+                sb.append("CometName: ").append(frame.getName()).append('\n');
+                sb.append("Length: ").append(length).append('\n');
+                sb.append("            Current  Average  Total").append('\n');
+                Time averageActive = new Time((long) (0.5 + active.getTime()
+                                / (1.0 * length)));
+                Time averageDark = new Time((long) (0.5 + dark.getTime()
+                                / (1.0 * length)));
+                Time averageTotal = new Time((long) (0.5 + total.getTime()
+                                / (1.0 * length)));
+                Time currentActive = SessionStats.getFrameActiveTime();
+                Time currentDark = SessionStats.getFrameDarkTime();
+                Time currentTotal = SessionStats.getFrameTotalTime();
+                
+                sb.append("ActiveTime: ").append(Logger.EasyTimeFormat(currentActive)).append(
+                ' ').append(Logger.EasyTimeFormat(averageActive)).append(
+                                ' ').append(Logger.EasyTimeFormat(active)).append('\n');
+                sb.append("  DarkTime: ").append(Logger.EasyTimeFormat(currentDark)).append(
+                ' ').append(Logger.EasyTimeFormat(averageDark)).append(
+                                ' ').append(Logger.EasyTimeFormat(dark)).append('\n');
+                sb.append(" TotalTime: ").append(Logger.EasyTimeFormat(currentTotal)).append(
+                ' ').append(Logger.EasyTimeFormat(averageTotal)).append(
+                                ' ').append(Logger.EasyTimeFormat(total));
+                CreateTextItem(sb.toString());
+
+                FrameGraphics.OverwriteMessage("Comet stats complete");
+        }
+
         public static void CreateTextItem(String itemText) {
                 SessionStats.CreatedText();
@@ -260 +299 @@
         public static void GetCurrentFrameFile() {
 
-                String fileContents = FrameIO.SaveFrame(DisplayIO.getCurrentFrame());
-
-                Text text = DisplayIO.getCurrentFrame().createNewText();
+                Frame current = DisplayIO.getCurrentFrame();
+                current.change();
+                String fileContents = FrameIO.SaveFrame(current);
+
+                Text text = current.createNewText();
                 // We dont want the stats to wrap at all
                 text.setMaxSize(new Dimension(Integer.MAX_VALUE, Integer.MAX_VALUE));
@@ -349 +390 @@
         }
 
-        public static String SaveImage(BufferedImage screen, String format, String directory, String fileName){
+        public static String SaveImage(BufferedImage screen, String format,
+                        String directory, String fileName) {
                 // Check if we need to append the suffix
                 if (fileName.indexOf('.') < 0)
-                        fileName += "." + format.toLowerCase();         
+                        fileName += "." + format.toLowerCase();
 
                 try {
@@ -370 +412 @@
                 return null;
         }
-        
+
         public static String ImageFrame(Frame frame, String format, String directory) {
                 assert (frame != null);
-                
+
                 FrameGraphics.UpdateBuffer(frame, false);
 

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

@@ -14 +14 @@
 import java.util.Random;
 
+import org.expeditee.agents.DefaultAgent;
 import org.expeditee.agents.DisplayTree;
 import org.expeditee.agents.WriteTree;
@@ -49 +50 @@
 import org.expeditee.stats.SessionStats;
 
-public class Simple {
+public class Simple implements Runnable {
 
         private static final String DEFAULT_STRING = "$s.";
@@ -87 +88 @@
         private static final String TOKEN_SEPARATOR = " +";
 
-        private static final String RUN_FRAME_ACTION = "RunFrame";
+        public static final String RUN_FRAME_ACTION = "runframe";
+
+        public static final String DEBUG_FRAME_ACTION = "debugframe";
 
         /**
@@ -100 +103 @@
          * Expeditee
          */
-        private static boolean _acceptKeyboardInput = false;
+        private static boolean _consumeKeyboardInput = false;
 
         public static void ProgramFinished() {
                 _programsRunning--;
+                _stop = false;
         }
 
         private static LinkedList<Character> _KeyStrokes = new LinkedList<Character>();
 
+        private static boolean _stop;
+
+        private static boolean _step;
+
+        private static int _stepPause = 0;
+
+        private static Color _stepColor;
+
+        private static boolean _nextStatement;
+
         public static void KeyStroke(char c) {
+                
+                
                 _KeyStrokes.add(c);
         }
@@ -116 +132 @@
         }
 
-        public static boolean acceptKeyboardInput() {
-                return _acceptKeyboardInput && _programsRunning > 0;
+        public static boolean consumeKeyboardInput() {
+                return _consumeKeyboardInput && _programsRunning > 0;
         }
 
@@ -134 +150 @@
                 do {
                         next = FrameIO.LoadNext(next);
-                } while (next != null
-                                && (next.getTitleItem() == null || !RUN_FRAME_ACTION
-                                                .equalsIgnoreCase(next.getTitleItem().getFirstAction())));
+                } while (next != null && next.isTestFrame());
                 FrameUtils.DisplayFrame(next, true);
         }
@@ -144 +158 @@
                 do {
                         prev = FrameIO.LoadPrevious(prev);
-                } while (prev != null
-                                && (prev.getTitleItem() == null || !RUN_FRAME_ACTION
-                                                .equalsIgnoreCase(prev.getTitleItem().getFirstAction())));
+                } while (prev != null && prev.isTestFrame());
 
                 FrameUtils.DisplayFrame(prev, true);
@@ -156 +168 @@
                 do {
                         // check if its a test frame
-                        if (next != null
-                                        && next.getTitleItem() != null
-                                        && RUN_FRAME_ACTION.equalsIgnoreCase(next.getTitleItem()
-                                                        .getFirstAction())) {
+                        if (next != null && next.isTestFrame()) {
                                 lastTest = next;
                                 break;
@@ -178 +187 @@
         }
 
-        public static void RunSimpleTests(String frameset, boolean verbose) {
+        private String _frameset;
+
+        private boolean _verbose;
+
+        public Simple(String frameset, boolean verbose) {
+                _frameset = frameset;
+                _verbose = verbose;
+        }
+
+        public void run() {
                 int testsPassed = 0;
                 int testsFailed = 0;
 
                 FrameIO.SaveFrame(DisplayIO.getCurrentFrame(), false);
-                FrameGraphics.DisplayMessage("Starting test suite: " + frameset,
+                FrameGraphics.DisplayMessage("Starting test suite: " + _frameset,
                                 Color.CYAN);
 
-                // Get the next number in the inf file for the frameset
-                int lastFrameNo = FrameIO.getLastNumber(frameset);
-
-                // Loop through all the valid frames in the frameset
+                // Get the next number in the inf file for the _frameset
+                int lastFrameNo = FrameIO.getLastNumber(_frameset);
+
+                // Loop through all the valid frames in the _frameset
                 for (int i = 1; i <= lastFrameNo; i++) {
-                        String nextFrameName = frameset + i;
+                        String nextFrameName = _frameset + i;
                         Frame nextFrame = FrameIO.LoadFrame(nextFrameName);
                         if (nextFrame == null)
@@ -214 +232 @@
                                         RunFrameAndReportError(title, new Context());
                                         _programsRunning--;
-                                        if (verbose)
+                                        if (_verbose)
                                                 FrameGraphics.DisplayMessage("Test passed: "
                                                                 + title.toString(), Item.GREEN);
@@ -223 +241 @@
                                         // Print out the reason for failed tests
                                         FrameGraphics.LinkedErrorMessage(e.getMessage());
+                                        if (Simple._stop) {
+                                                Simple._stop = false;
+                                                return;
+                                        }
                                 }
                         }
@@ -240 +262 @@
         }
 
-        public static void RunFrame(Item current) {
-                RunFrame(current, false);
-        }
-
-        public static void RunFrame(Item current, boolean acceptKeyboardInput) {
+        public static void RunSimpleTests(String frameset, boolean verbose) {
+                _stop = false;
+                Thread t = new Thread(new Simple(frameset, verbose));
+                t.setPriority(Thread.MIN_PRIORITY);
+                t.start();
+        }
+
+        private static void RunFrame(Item current, boolean acceptKeyboardInput,
+                        boolean step, int pause, Color color) {
                 try {
-                        _acceptKeyboardInput = acceptKeyboardInput;
+                        DisplayIO.addToBack(current.getParent());
+
+                        _stepColor = color == null ? Color.green : color;
+                        _stepColor = new Color(_stepColor.getRed(), _stepColor.getGreen(),
+                                        _stepColor.getBlue(), 50);
+                        _stepPause = pause;
+                        _step = step;
+                        _consumeKeyboardInput = acceptKeyboardInput;
                         FrameIO.SaveFrame(DisplayIO.getCurrentFrame(), true);
 
@@ -265 +298 @@
                         // _programsRunning--;
                 }
+        }
+
+        public static void RunFrame(Item current, boolean acceptKeyboardInput) {
+                RunFrame(current, acceptKeyboardInput, false, 0, null);
+        }
+
+        public static void RunFrame(Item current) {
+                RunFrame(current, false);
+        }
+
+        /**
+         * At present programs which accept keyboard input can not be debugged.
+         * 
+         * @param current
+         * @param pause
+         */
+        public static void DebugFrame(Item current, double pause, Color color) {
+                RunFrame(current, false, true, (int) (pause * 1000 + 0.5), color);
+        }
+
+        /**
+         * At present programs which accept keyboard input can not be debugged.
+         * 
+         * @param current
+         * @param pause
+         *            the time to pause between
+         */
+        public static void DebugFrame(Item current, double pause) {
+                DebugFrame(current, pause, null);
+        }
+
+        public static void DebugFrame(Item current) {
+                DebugFrame(current, 0.2, null);
         }
 
@@ -290 +356 @@
 
                 Frame child = FrameIO.LoadFrame(current.getAbsoluteLink());
+
+                if (_step) {
+                        DisplayIO.setCurrentFrame(child);
+                        DisplayIO.addToBack(child);
+                }
+
                 AgentStats.FrameExecuted();
 
@@ -299 +371 @@
 
                 // loop through non-title, non-name, non-annotation text items
-                List<Item> body = child.getItems();
-                Text item = null;
+                List<Text> body = child.getBodyTextItems(false);
+
+                // if no item was found
+                if (body.size() == 0)
+                        throw new Exception("No code to be executed: " + current.toString());
+
                 Status lastItemStatus = Status.OK;
-                for (Item i : body)
-                        // Ignore items that arent statements
-                        if (isStatement(i)) {
-                                item = (Text) i;
-                                AgentStats.ItemExecuted();
-                                try {
-
-                                        lastItemStatus = RunItem(item, context, lastItemStatus);
-
-                                        if (lastItemStatus != Status.OK) {
-                                                if (lastItemStatus != Status.TrueIf
-                                                                && lastItemStatus != Status.FalseIf) {
-                                                        return lastItemStatus;
+                for (Text item : body) {
+                        AgentStats.ItemExecuted();
+                        try {
+                                Color oldColor = item.getBackgroundColor();
+                                if (_step) {
+                                        if (item.getLink() == null) {
+                                                item.setBackgroundColor(_stepColor);
+                                        }else{
+                                                item.setSelectedMode(Item.SelectedMode.Normal,_stepColor);
+                                        }
+                                        FrameGraphics.Repaint();
+                                }
+                                lastItemStatus = RunItem(item, context, lastItemStatus);
+                                if (_step) {
+                                        if (item.getLink() != null) {
+                                                item.setBackgroundColor(_stepColor);
+                                                item.setSelectedMode(Item.SelectedMode.None);
+                                                FrameGraphics.Repaint();
+                                        }
+                                        int timeRemaining;
+                                        if (_stepPause < 0)
+                                                timeRemaining = Integer.MAX_VALUE;
+                                        else
+                                                timeRemaining = _stepPause;
+
+                                        while (timeRemaining > 0 && !_nextStatement) {
+                                                if (_stop) {
+                                                        item.setBackgroundColor(oldColor);
+                                                        item.setSelectedMode(SelectedMode.Normal,_stepColor);
+                                                        throw new Exception("Program terminated");
                                                 }
+                                                Thread.sleep(DefaultAgent.TIMER_RESOLUTION);
+                                                timeRemaining -= DefaultAgent.TIMER_RESOLUTION;
                                         }
-                                } catch (ArrayIndexOutOfBoundsException e) {
-                                        FlagError(item);
-                                        throw new Exception("Too few parametres: "
-                                                        + item.toString());
-                                } catch (NullPointerException e) {
-                                        FlagError(item);
-                                        throw new Exception("Null pointer exception: "
-                                                        + item.toString());
-                                } catch (RuntimeException e) {
-                                        FlagError(item);
-                                        throw new Exception(e.getMessage() + " " + item.toString());
-                                } catch (Exception e) {
-                                        throw new Exception(e.getMessage());
-                                }
-                        }
-
-                // if no item was found
-                if (item == null)
-                        throw new Exception("No code to be executed: " + current.toString());
+                                        _nextStatement = false;
+                                        // Turn off the highlighting
+                                        item.setBackgroundColor(oldColor);
+                                }
+
+                                if (lastItemStatus != Status.OK) {
+                                        if (lastItemStatus != Status.TrueIf
+                                                        && lastItemStatus != Status.FalseIf) {
+                                                return lastItemStatus;
+                                        }
+                                }
+                        } catch (ArrayIndexOutOfBoundsException e) {
+                                FlagError(item);
+                                throw new Exception("Too few parametres: " + item.toString());
+                        } catch (NullPointerException e) {
+                                FlagError(item);
+                                throw new Exception("Null pointer exception: "
+                                                + item.toString());
+                        } catch (RuntimeException e) {
+                                FlagError(item);
+                                throw new Exception(e.getMessage() + " " + item.toString());
+                        } catch (Exception e) {
+                                throw new Exception(e.getMessage());
+                        }
+                }
+
+                if (_step) {
+                        DisplayIO.setCurrentFrame(current.getParent());
+                        DisplayIO.removeFromBack();
+                }
 
                 return Status.OK;
-        }
-
-        private static boolean isStatement(Item i) {
-                if (!(i instanceof Text))
-                        return false;
-
-                Frame frame = i.getParent();
-
-                if (i == frame.getTitleItem() || i == frame.getNameItem()
-                                || i.isAnnotation()) {
-                        return false;
-                }
-
-                return true;
         }
 
@@ -541 +633 @@
         private static Status RunItem(Text code, Context context,
                         Status lastItemStatus) throws Exception {
+                if (_stop) {
+                        throw new Exception("Program terminated");
+                }
 
                 String[] tokens = code.getProcessedCode();
@@ -1805 +1900 @@
                                                                         .StripTag(
                                                                                         ((Text) pauseItem).getFirstLine(),
-                                                                                        "@DisplayFramePause:"));
+                                                                                        "@DisplayFramePause"));
                                                 } catch (NumberFormatException nfe) {
                                                 }
@@ -2242 +2337 @@
                                 assertExactParametreCount(tokens, 3);
                                 assertVariableType(tokens[1], 1, SPointer.associationPrefix);
-                                Map<String,String> map = (Map<String,String>) context.getPointers().getVariable(
-                                                tokens[1]).getValue();
-                                for(Map.Entry entry: map.entrySet()){
+                                Map<String, String> map = (Map<String, String>) context
+                                                .getPointers().getVariable(tokens[1]).getValue();
+                                for (Map.Entry entry : map.entrySet()) {
                                         String value = entry.getValue().toString();
                                         String key = entry.getKey().toString();
@@ -2259 +2354 @@
                                 return Status.OK;
                         }
-                        
+
                         if (Primitives.isPrimitive(tokens[1])
                                         && Primitives.isPrimitive(tokens[2])
@@ -2353 +2448 @@
                 return message.toString();
         }
+
+        public static void stop() {
+                _stop = true;
+        }
+
+        public static void nextStatement() {
+                _nextStatement = true;
+        }
 }