Revize fffe7190

re #8962 Adding filtering method GetPredictionForTime to json parser + adding attributes with file names to DataParser + fixing bug in json parser method Parse

Server/ServerApp/Parser/Parsers/DataParser.cs

@@ -82 +82 @@
             var jisFiles = downloader.GetData(pathJis, start, end);
             var loginFiles = downloader.GetData(pathLogIn, start, end);
 
+            WeatherDataUsed = new List<string>();
+            ActivityDataUsed = new List<string>();
+
+            WeatherDataUsed.AddRange(weatherFiles);
+            ActivityDataUsed.AddRange(jisFiles);
+            ActivityDataUsed.AddRange(loginFiles);
+
             WeatherList = weatherParser.ParseWeatherData(weatherFiles, startTime, endTime, wholeDay, interval);
             jisList = jisParser.ParseJisData(jisFiles, startTime, endTime, wholeDay, interval);
             loginList = loginParser.ParseLogInData(loginFiles, startTime, endTime, wholeDay, interval);

Server/ServerApp/Parser/Parsers/IDataParser.cs

@@ -21 +21 @@
         List<ActivityInfo> attendanceList;
         public List<ActivityInfo> AttendanceList { get => attendanceList; internal set => attendanceList = value; }
 
+        /// <summary> List of weather file names the parser was last used on </summary>
+        List<String> weatherdataUsed;
+        public List<string> WeatherDataUsed { get => weatherdataUsed; set => weatherdataUsed = value; }
+
+        /// <summary> List of activity file names the parser was last used on </summary>
+        List<String> activitydataUsed;
+        public List<string> ActivityDataUsed { get => activitydataUsed; set => activitydataUsed = value; }
+
+
         /// <summary>
         /// Parse data
         /// </summary>

Server/ServerApp/Program.cs

@@ -1 +1 @@
 using ServerApp.Connection;
 using ServerApp.Connection.XMLProtocolHandler;
 using ServerApp.DataDownload;
+using ServerApp.Parser.OutputInfo;
 using ServerApp.Parser.Parsers;
 using ServerApp.Predictor;
 using ServerApp.User;
@@ -136 +137 @@
             JsonParser jsonP = new JsonParser(null);
 			jsonP.ParsePrediction();
 
+			var res = jsonP.GetPredictionForTime(jsonP.Predictions[5].startTime, jsonP.Predictions[20].startTime);
+			Console.WriteLine("from " + jsonP.Predictions[5].startTime);
+			Console.WriteLine("end " + jsonP.Predictions[20].startTime);
+			foreach (WeatherInfo w in res)
+				Console.WriteLine(w.ToString());
+
+
 			// TODO nastavit čas
 			IDataParser p = new DataParser(dd);
             IPredictionController predictionController = new PredictionController(p);

Server/ServerApp/WeatherPredictionParser/IJsonParser.cs

@@ -3 +3 @@
 //
 
 using ServerApp.Parser.OutputInfo;
+using System;
 using System.Collections.Generic;
 
 namespace ServerApp.WeatherPredictionParser
@@ -15 +16 @@
 
         /// <summary> Current weather </summary>
         WeatherInfo current;
-        public WeatherInfo Current { get => current; }
+        public WeatherInfo Current { get => current; set => current = value; }
 
         /// <summary> Prediction for today, tommorrow and day after tommorrow </summary>
         List<WeatherInfo> predictions;
@@ -27 +28 @@
         /// </summary>
         abstract public void ParsePrediction();
 
+        /// <summary>
+        /// Get predictions from Predictions that are within specified time span
+        /// </summary>
+        /// <param name="from">DateTime from</param>
+        /// <param name="to">DateTime to</param>
+        /// <returns>List of predictions that fit specified criteria</returns>
+        abstract public List<WeatherInfo> GetPredictionForTime(DateTime from, DateTime to);
+
     }
 
 }

Server/ServerApp/WeatherPredictionParser/JsonParser.cs

@@ -20 +20 @@
     /// <author>A. Konig</author>
     class JsonParser : IJsonParser
     {
-        /// <summary> Current weather </summary>
-        WeatherInfo current;
-        public new WeatherInfo Current { get => current; }
-        /// <summary> Prediction for today, tommorrow and day after tommorrow </summary>
-        List<WeatherInfo> predictions;
-        public new List<WeatherInfo> Predictions { get => predictions; set => predictions = value; }
-
         /// <summary> Data loader </summary>
         DataDownloader loader;
         /// <summary> Currently parsed day </summary>
@@ -46 +39 @@
             this.loader = loader;
         }
 
+        /// <summary>
+        /// Get predictions from Predictions that are within specified time span
+        /// From-to including
+        /// If from == null then all until to
+        /// If to  == null then all starting from from
+        /// </summary>
+        /// <param name="from">DateTime from</param>
+        /// <param name="to">DateTime to</param>
+        /// <returns>List of predictions that fit specified criteria or null if incorrect input</returns>
+        public override List<WeatherInfo> GetPredictionForTime(DateTime from, DateTime to)
+        {
+            if (Predictions == null)
+                return null;
+
+            List<WeatherInfo> res = new List<WeatherInfo>();
+
+            if (from == null)
+                from = Predictions[0].startTime;
+
+            if (to == null)
+                from = Predictions[Predictions.Count].startTime;
+
+            if (from > to)
+                return null;
+
+            foreach (WeatherInfo pred in Predictions)
+            {
+                int hour = pred.startTime.Hour + pred.intervalLength;
+                Console.WriteLine(pred.intervalLength);
+                bool addDay = false;
+                if (hour >= 24)
+                {
+                    hour -= 24;
+                    addDay = true;
+                }
+                DateTime endTime = new DateTime(pred.startTime.Year, pred.startTime.Month, pred.startTime.Day, hour, pred.startTime.Minute, pred.startTime.Second);
+                if (addDay)
+                    endTime = endTime.AddDays(1);
+
+                // if both end and start not outside of interval
+                if (!((pred.startTime < from && endTime <= from) || (pred.startTime > to && endTime >= to)))
+                    res.Add(pred);
+            }
+
+            return res;
+        }
+
         /// <summary>
         /// Parse weather prediction
         /// Results is in attributes current for current weather and pred for weather prediction for today, tommorrow and day after tommorrow
@@ -59 +99 @@
             DateTime now = DateTime.Now;
             Console.WriteLine(File.Exists(file));
 
-            current = new WeatherInfo();
-            predictions = new List<WeatherInfo>();
+            Current = new WeatherInfo();
+            Predictions = new List<WeatherInfo>();
 
             if (!File.Exists(file))
                 return;
@@ -84 +124 @@
                     case "current_condition":
                         {
                             ArrayEnumerator currentWeather = weatherP.Current.Value.EnumerateArray();
-                            current = ParseCurrentWeather(currentWeather);
+                            Current = ParseCurrentWeather(currentWeather);
 
                             break;
                         }
@@ -110 +150 @@
         /// </summary>
         private void TestConsoleOutput()
         {
-            Console.WriteLine(current);
-            foreach (WeatherInfo w in predictions)
+            Console.WriteLine(Current);
+            foreach (WeatherInfo w in Predictions)
                 Console.WriteLine(w);
         }
 
@@ -137 +177 @@
         private void EncompassSunRiseSetTimes()
         {
             // change current weather
-            if ((current.startTime.TimeOfDay > sunsetTime.TimeOfDay) || (current.startTime.TimeOfDay < sunriseTime.TimeOfDay))
-                current.condition = WeatherConditions.Dark;
+            if ((Current.startTime.TimeOfDay > sunsetTime.TimeOfDay) || (Current.startTime.TimeOfDay < sunriseTime.TimeOfDay))
+                Current.condition = WeatherConditions.Dark;
 
             // change prediction
-            for (int i = 0; i < predictions.Count - 1; i++)
+            for (int i = 0; i < Predictions.Count - 1; i++)
             {
-                WeatherInfo w = predictions[i];
-                WeatherInfo wNext = predictions[i + 1];
+                WeatherInfo w = Predictions[i];
+                WeatherInfo wNext = Predictions[i + 1];
 
                 // if wNext time < than w time then it is prediction from the next day -> add 24 to correctly calculate timespan
                 int timespan = wNext.startTime.Hour - w.startTime.Hour;
@@ -178 +218 @@
             }
 
             // last prediction
-            WeatherInfo wLast = predictions[predictions.Count - 1];
+            WeatherInfo wLast = Predictions[Predictions.Count - 1];
             TimeSpan endTimeW = new TimeSpan(24, 0, 0);
-            int timespanLast = endTimeW.Hours - wLast.startTime.Hour;
+            int timespanLast = 24 - wLast.startTime.Hour;
             wLast.intervalLength = timespanLast;
 
             // if start under sunset
@@ -338 +378 @@
                 }
 
                 // Console.WriteLine(weather.ToString());
-                predictions.Add(weather);
+                Predictions.Add(weather);
 
             }
 
@@ -401 +441 @@
             return res;
         }
 
+      
     }
 }