Changeset 6469

Timestamp:

06/22/11 16:47:57 (14 years ago)

Author:

cneumuel

Message:

#1215

• minor statistics improvements

Location:

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Web/Hive-3.4

Files:

• Status.aspx (modified) (4 diffs)
• Status.aspx.cs (modified) (2 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Web/Hive-3.4/Status.aspx

@@ -25 +25 @@
     Avg. CPU Utilization:
     <asp:Label ID="cpuUtilizationLabel" runat="server" />
+    <br />
+    Total ExecutionTime on Hive:
+    <asp:Label ID="totalExecutionTimeLabel" runat="server" />
     <br />
     <br />
@@ -69 +72 @@
     </asp:Chart>
     <br />
-    <br />
     Cores/Used Cores History<br />
     <asp:Chart ID="coresChart" runat="server" Palette="None" Width="1900px" PaletteCustomColors="137, 165, 78; 185, 205, 150">
@@ -93 +95 @@
       </ChartAreas>
     </asp:Chart>
-    <br />
     <br />
     Memory/Used Memory History (GB)<br />
@@ -142 +143 @@
     </asp:Chart>
     <br />
-    <br />
     Speedup (ComputedHours/Hour)<br />
     <br />

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Services.Hive.Web/Hive-3.4/Status.aspx.cs

@@ -26 +26 @@
     slavesLabel.Text = string.Join(", ", onlineSlaves.Select(x => string.Format("{0} ({1} %)", x.Name, Math.Round(x.CpuUtilization, 2))));
 
-    cpuUtilizationLabel.Text = onlineSlaves.Count() > 0 ? onlineSlaves.Average(s => s.CpuUtilization).ToString() : "0.0";
+    cpuUtilizationLabel.Text = (onlineSlaves.Count() > 0 ? Math.Round(onlineSlaves.Average(s => s.CpuUtilization), 2).ToString() : "0.0") + " %";
 
     HeuristicLab.Services.Hive.Common.DataTransfer.Statistics[] stats;
@@ -34 +34 @@
       stats = dao.GetStatistics(x => x.Timestamp >= DateTime.Now.Subtract(TimeSpan.FromDays(int.Parse(daysDropDownList.SelectedValue)))).OrderByDescending(x => x.TimeStamp).ToArray();
 
+    var firstStatisticsDate = DateTime.Parse("2011-05-24 17:16:40");
+    var statisticsSince = DateTime.Now - firstStatisticsDate;
+    totalExecutionTimeLabel.Text = new TimeSpan(stats.First().UserStatistics.Sum(x => x.ExecutionTime.Ticks)).ToString() + " (since " + Math.Round(statisticsSince.TotalDays, 2) + " days)";
 
     for (int i = 0; i < stats.Length; i++) {