Revize 0060a0ae

Re #9056 refactoring

Server/ServerApp/Predictor/PredictionController.cs

@@ -129 +129 @@
             return response;
         }
 
-        private Prediction PredictSingle(Request request, DateTime current)
+        private Prediction PredictSingle(Request request, DateTime predictionTime)
         {
             double[] predictedValues = new double[this.Configuration.BuildingsToAreas.Count];
             string[] predictedLabels = new string[this.Predictors.Count];
@@ -143 +143 @@
                         Rain = (float)request.rain,
                         Temp = (float)request.temperature,
                         Wind = (float)request.wind,
-                        Hour = current.Hour,
-                        Time = current
+                        Hour = predictionTime.Hour,
+                        Time = predictionTime
                     });
                 }
                 else
                 {
                     _log.Debug("Retrieving weather info from the weather service.");
                     weatherService.ParsePrediction();
-                    WeatherInfo weatherInfo = weatherService.Predictions.Find(info => info.startTime.Equals(current));
+                    WeatherInfo weatherInfo = weatherService.Predictions.Find(info => info.startTime.Date.Equals(predictionTime.Date) && predictionTime.TimeOfDay.Subtract(info.startTime.TimeOfDay).Hours < info.intervalLength);
                     if (weatherInfo is null)
                     {
                         predictedLabels[i] = null;
@@ -163 +163 @@
                             Rain = weatherInfo.rain,
                             Temp = (float)weatherInfo.temp,
                             Wind = (float)weatherInfo.wind,
-                            Hour = current.Hour,
-                            Time = current
+                            Hour = predictionTime.Hour,
+                            Time = predictionTime
                         });
                     }
                 }
@@ -177 +177 @@
             Prediction prediction = new Prediction();
             prediction.dateTime = new Date
             {
-                year = current.Year,
-                month = current.Month,
-                day = current.Day,
-                hour = current.Hour
+                year = predictionTime.Year,
+                month = predictionTime.Month,
+                day = predictionTime.Day,
+                hour = predictionTime.Hour
             };
             prediction.predictions = predictedValues;
             _log.Debug($"Created prediction for DateTime: {prediction.dateTime}");