Revize 98b568bc

re #8612 Weather parser in hourly intervals

Server/ServerApp/Parser/Parsers/LogInParser.cs

@@ -10 +10 @@
     /// Class parsing login files into instances of ActivityInfo divided by given time interval
     /// Data parsed from 7am (included) to 18pm (included)
     /// </summary>
+    /// <author>Alex Konig</author>
     class LogInParser
     {
+        /// <summary> Datafile loader  </summary>
+        DataLoader loader;
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="loader">Datafile loader</param>
+        public LogInParser(DataLoader loader)
+        {
+            this.loader = loader;
+        }
+
         /// <summary>
         /// Parses login data to ActivityInfo instances
         /// Data parsed from 7am (included) to 18pm (included)
@@ -51 +64 @@
         /// </summary>
         /// <param name="path">Path ti file</param>
         /// <returns>List with ActivityInfo instances</returns>
-        private static List<ActivityInfo> ProcessOneLogInFileAsDays(string path)
+        private List<ActivityInfo> ProcessOneLogInFileAsDays(string path)
         {
             if (!File.Exists(path))
                 return null;
 
             List<ActivityInfo> loginInfo = new List<ActivityInfo>();
-            List<LogInInstance> list = CsvDataLoader.LoadLoginFile(path);
+            List<LogInInstance> list = loader.LoadLoginFile(path);
 
             // data for each faculty
             int[] recordedAmount = new int[TagInfo.faculties.Length];
@@ -126 +139 @@
             return loginInfo;
         }
 
-        private static List<ActivityInfo> ProcessOneLoginFileAsIntervals(string path, int interval)
+        /// <summary>
+        /// Parses data from one data file as one instance per interval length
+        /// </summary>
+        /// <param name="path">Path to file</param>
+        /// <param name="interval">Interval length</param>
+        /// <returns>List with ActivityInfo instances</returns>
+        private List<ActivityInfo> ProcessOneLoginFileAsIntervals(string path, int interval)
         {
             if (!File.Exists(path))
                 return null;
 
             List<ActivityInfo> loignInfo = new List<ActivityInfo>();
-            List<LogInInstance> list = CsvDataLoader.LoadLoginFile(path);
+            List<LogInInstance> list = loader.LoadLoginFile(path);
 
-            // data for each faculty
-            int[] recordedAmount = new int[TagInfo.faculties.Length];
             // min/max hour taken into account
             int[] minmaxHour = new int[] { 7, 18 };
             int range = minmaxHour[1] - minmaxHour[0];