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

Timestamp:

06/06/08 12:42:25 (16 years ago)

Author:

ra33

Message:

Added getTreeStats

Location:

trunk/src/org/expeditee/actions

Files:

• Misc.java (modified) (4 diffs)
• Simple.java (modified) (6 diffs)

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;
@@ -23 +22 @@
 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;
+import org.expeditee.stats.CometStats;
 import org.expeditee.stats.SessionStats;
 import org.expeditee.stats.StatsLogger;
+import org.expeditee.stats.TreeStats;
 
 /**
@@ -56 +56 @@
         public static void Restore() {
                 FrameIO.Reload();
-                //FrameGraphics.DisplayMessage("Restoration complete.");
+                // FrameGraphics.DisplayMessage("Restoration complete.");
         }
 
@@ -232 +232 @@
          */
         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");
+                TimeKeeper timer = new TimeKeeper();
+                FrameGraphics.DisplayMessage("Computing comet stats...");
+
+                CometStats cometStats = new CometStats(frame, true);
+                CreateTextItem(cometStats.toString());
+                FrameGraphics.OverwriteMessage("Comet stats time: "
+                                + timer.getElapsedStringSeconds());
+        }
+
+        public static void GetTreeStats(Frame frame) {
+                TimeKeeper timer = new TimeKeeper();
+                FrameGraphics.DisplayMessage("Computing tree stats...");
+
+                TreeStats treeStats = new TreeStats(frame, true);
+                CreateTextItem(treeStats.toString());
+                FrameGraphics.OverwriteMessage("Tree stats time: "
+                                + timer.getElapsedStringSeconds());
         }
 

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

@@ -239 +239 @@
                                         // if the throws exception annotation is on the frame then
                                         // it passes only if an exception is thrown
-                                        if (title.getParentOrCurrentFrame().hasAnnotation("ThrowsException")) {
+                                        if (title.getParentOrCurrentFrame().hasAnnotation(
+                                                        "ThrowsException")) {
                                                 errorMessage = "Expected exception " + title.toString();
                                                 passed = false;
@@ -245 +246 @@
                                 } catch (Exception e) {
                                         _programsRunning--;
-                                        if (!title.getParentOrCurrentFrame().hasAnnotation("ThrowsException")) {
+                                        if (!title.getParentOrCurrentFrame().hasAnnotation(
+                                                        "ThrowsException")) {
                                                 errorMessage = e.getMessage();
                                                 passed = false;
@@ -390 +392 @@
 
                 if (_step) {
-                        DisplayIO.setCurrentFrame(child);
+                        if (child != DisplayIO.getCurrentFrame()) {
+                                DisplayIO.setCurrentFrame(child);
+                        }
                         DisplayIO.addToBack(child);
                 }
@@ -437 +441 @@
                                         if (lastItemStatus != Status.TrueIf
                                                         && lastItemStatus != Status.FalseIf) {
+                                                if (_step) {
+                                                        DisplayIO.removeFromBack();
+                                                }
                                                 return lastItemStatus;
                                         }
@@ -456 +463 @@
 
                 if (_step) {
+                        DisplayIO.removeFromBack();
                         DisplayIO.setCurrentFrame(current.getParent());
-                        DisplayIO.removeFromBack();
                 }
 
@@ -525 +532 @@
                 ArrayList<String> tokens = new ArrayList<String>();
 
-                //At the moment annotation items are ignored by the interpreter
-//              // Check special annotation tags for programs
-//              if (statement.length() > 0 && statement.charAt(0) == '@') {
-//                      statement = statement.toLowerCase();
-//                      // Flags the next unit test as being required to throw an exception
-//                      if (statement.equals("@throwsexception")) {
-//                              code.getParentOrCurrentFrame().setThrowsException(true);
-//                      }
-//                      return null;
-//              }
+                // At the moment annotation items are ignored by the interpreter
+                // // Check special annotation tags for programs
+                // if (statement.length() > 0 && statement.charAt(0) == '@') {
+                // statement = statement.toLowerCase();
+                // // Flags the next unit test as being required to throw an exception
+                // if (statement.equals("@throwsexception")) {
+                // code.getParentOrCurrentFrame().setThrowsException(true);
+                // }
+                // return null;
+                // }
 
                 for (int i = 0; i < statement.length(); i++) {