Revize 0d31f7e0

Re #8953 tests

Server/ServerApp/Predictor/PredictionController.cs

@@ -9 +9 @@
 using Newtonsoft.Json;
 using ServerApp.WeatherPredictionParser;
 using ServerApp.Parser.OutputInfo;
+using System.Reflection;
+using log4net;
 
 namespace ServerApp.Predictor
 {
@@ -17 +19 @@
     /// </summary>
     public class PredictionController : IPredictionController
     {
+        private static readonly ILog _log = LogManager.GetLogger(typeof(PredictionController));
+
         /// <summary>
         /// Configuration of the <c>Predictor</c>
         /// </summary>
@@ -45 +49 @@
         /// <param name="dataParser">A data parser used to get training data.</param>
         public PredictionController(IJsonParser weatherService, IDataParser dataParser, string pathToConfig = null)
         {
+            _log.Info("Constructing a new PredictionController instance.");
             this.weatherService = weatherService;
             // load config or get the default one
             if (pathToConfig is null)
@@ -55 +60 @@
             {
                 string json = System.IO.File.ReadAllText(pathToConfig);
                 this.Configuration = JsonConvert.DeserializeObject<PredictorConfiguration>(json);
-            } catch (System.IO.IOException e)
+            }
+            catch (System.IO.IOException e)
             {
                 Console.WriteLine("Warning: could not find a configuration file, creating a new one:");
                 Console.WriteLine(e.Message.PadLeft(4));
@@ -91 +97 @@
 
         public Response Predict(Request request)
         {
+            _log.Info($"Received a prediction request: endDate={request.useEndDate}, weather={request.useWeather}");
             DateTime start = new DateTime(year: request.start.year, month: request.start.month, day: request.start.day, hour: request.start.hour, minute: 0, second: 0);
             List<Prediction> predictions = new List<Prediction>();
             if (request.useEndDate)
@@ -99 +106 @@
                 DateTime current = start;
                 while (current < end)
                 {
+                    _log.Debug($"Predicting for date {current.Date.ToShortDateString()}");
                     while (current.Hour < Date.MAX_HOUR)
                     {
+                        _log.Debug($"Predicting for time {current.TimeOfDay.ToString()}");
                         var prediction = PredictSingle(request, current);
                         predictions.Add(prediction);
                         current = current.AddHours(this.Configuration.TimeResolution);
                     }
                     current = current.AddHours(23 - current.Hour + Date.MIN_HOUR);
                 }
-            } else
+            }
+            else
             {
-                if (request.useWeather)
-                {
-                    predictions.Add(PredictSingle(request, start));
-                }
+                _log.Debug("Predicting for single DateTime.");
+                predictions.Add(PredictSingle(request, start));
             }
             var response = new Response();
             response.hoursPerSegment = Configuration.TimeResolution;
             response.predicitons = predictions.ToArray();
+            _log.Debug($"Created a response.");
             return response;
         }
 
@@ -128 +137 @@
             {
                 if (request.useWeather)
                 {
+                    _log.Debug("Predicting for requested weather.");
                     predictedLabels[i] = this.Predictors[i].Predict(new ModelInput
                     {
                         Rain = (float)request.rain,
@@ -139 +149 @@
                 }
                 else
                 {
-                    List<WeatherInfo> weatherInfos = weatherService.GetPredictionForTime(from: current, to: current.AddHours(this.Configuration.TimeResolution));
+                    _log.Debug("Retrieving weather info from the weather service.");
+                    weatherService.ParsePrediction();
+                    WeatherInfo weatherInfo = weatherService.Current;
                     predictedLabels[i] = this.Predictors[i].Predict(new ModelInput
                     {
-                        Rain = weatherInfos[0].rain,
-                        Temp = (float)weatherInfos[0].temp,
-                        Wind = (float)weatherInfos[0].wind,
+                        Rain = weatherInfo.rain,
+                        Temp = (float)weatherInfo.temp,
+                        Wind = (float)weatherInfo.wind,
                         Hour = current.Hour,
                         Time = current
                     });
@@ -164 +176 @@
                 hour = current.Hour
             };
             prediction.predictions = predictedValues;
+            _log.Debug($"Created prediction for DateTime: {prediction.dateTime}");
             return prediction;
         }