Changeset 90 for trunk/src/org/expeditee/actions/Misc.java

Timestamp:

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

Author:

ra33

Message:

Added getTreeStats

File:

• trunk/src/org/expeditee/actions/Misc.java (modified) (4 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());
         }