Changeset 15261 for stable/HeuristicLab.Services.WebApp.Status/3.3/WebApi

Timestamp:

07/16/17 13:03:37 (7 years ago)

Author:

jkarder

Message:

#2743: merged r14722, r14726, r14732, r14738, r14748:14749, r14820, r14828, r15005 and r15075 into stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Services.WebApp.Status/3.3/WebApi/DataController.cs (modified) (1 diff)

stable/HeuristicLab.Services.WebApp.Status/3.3/WebApi/DataController.cs

@@ -91 +91 @@
           AvgWaitingTime = count > 0 ? (long)calculatingTasks.OrderBy(x => x.StartTime).Take(count).Average(x => x.InitialWaitingTime) : 0,
           AvgCalculatingTime = lastCalculatingTimes != null ? lastCalculatingTimes.Avg : 0,
-          TotalCpuTime = factTasks.Sum(x => Convert.ToInt64(x.CalculatingTime)),
+          TotalCpuTime = factTasks.Sum(x => (long?)x.CalculatingTime) ?? 0,
           StandardDeviationCalculatingTime = (long)StandardDeviation(completedTasks.Select(x => (double)x.CalculatingTime)),
           BeginDate = factTasks.Where(x => x.StartTime.HasValue).OrderBy(x => x.StartTime).Select(x => x.StartTime).FirstOrDefault()