- Timestamp:
- 07/08/15 15:51:32 (9 years ago)
- Location:
- branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Status/3.3
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Status/3.3/WebApi/DataController.cs
r12558 r12691 85 85 }).FirstOrDefault(); 86 86 var calculatingTasks = factTasks.Where(x => x.TaskState == TaskState.Calculating); 87 int count = calculatingTasks.Count() ;87 int count = calculatingTasks.Count() / 3; 88 88 return new DT.TimeStatus { 89 89 MinCalculatingTime = lastCalculatingTimes != null ? lastCalculatingTimes.Min : 0, 90 90 MaxCalculatingTime = lastCalculatingTimes != null ? lastCalculatingTimes.Max : 0, 91 AvgWaitingTime = count > 0 ? (long)calculatingTasks.OrderBy(x => x.StartTime).Take(count / 3).Average(x => x.InitialWaitingTime) : 0,91 AvgWaitingTime = count > 0 ? (long)calculatingTasks.OrderBy(x => x.StartTime).Take(count).Average(x => x.InitialWaitingTime) : 0, 92 92 AvgCalculatingTime = lastCalculatingTimes != null ? lastCalculatingTimes.Avg : 0, 93 93 TotalCpuTime = factTasks.Sum(x => x.CalculatingTime), -
branches/HiveStatistics/sources/HeuristicLab.Services.WebApp.Status/3.3/WebApp/history/history.cshtml
r12584 r12691 33 33 <div class="btn-group" dropdown dropdown-append-to-body> 34 34 <button type="button" class="btn btn-default dropdown-toggle" dropdown-toggle style="width: 130px; text-align: left;"> 35 {{curQuickSelection.name}} <span class="glyphicon glyphicon-chevron-down" style="margin-top: 3px; float:right"></span> 35 <span class="text-left" style="display: inline-block; width: 85px;">{{curQuickSelection.name}}</span> 36 <span class="glyphicon glyphicon-chevron-down" style="margin-top: 3px;"></span> 36 37 </button> 37 38 <ul class="dropdown-menu" role="menu">
Note: See TracChangeset
for help on using the changeset viewer.