Revize 98b568bc

re #8612 Weather parser in hourly intervals

Server/ServerApp/Parser/Parsers/JisParser.cs

@@ -10 +10 @@
     /// Class parsing jis files into instances of ActivityInfo divided by given time interval
     /// Data parsed from 7am (included) to 18pm (included)
     /// </summary>
+    /// <author>Alex Konig</author>
     class JisParser
     {
-        
+
+        /// <summary> Datafile loader  </summary>
+        DataLoader loader;
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="loader">Datafile loader</param>
+        public JisParser(DataLoader loader)
+        {
+            this.loader = loader;
+        }
+
         /// <summary>
         /// Parses jis data to ActivityInfo instances
         /// Data parsed from 7am (included) to 18pm (included)
@@ -52 +65 @@
         /// </summary>
         /// <param name="path">Path ti file</param>
         /// <returns>List with ActivityInfo instances</returns>
-        private static List<ActivityInfo> ProcessOneJisFileAsDays(string path)
+        private List<ActivityInfo> ProcessOneJisFileAsDays(string path)
         {
             if (!File.Exists(path))
                 return null;
 
             List<ActivityInfo> jisInfo = new List<ActivityInfo>();
-            List<JisInstance> list =  CsvDataLoader.LoadJisFile(path);
+            List<JisInstance> list =  loader.LoadJisFile(path);
 
             // data for each faculty
             int[] recordedAmount = new int[TagInfo.faculties.Length];
@@ -120 +133 @@
             return jisInfo;
         }
 
-        private static List<ActivityInfo> ProcessOneJisFileAsIntervals(string path, int interval)
+        /// <summary>
+        /// Parses data from one data file as instance per interval length in a day
+        /// </summary>
+        /// <param name="path">Path ti file</param>
+        /// <param name="interval">Interval length</param>
+        /// <returns>List with ActivityInfo instances</returns>
+        private List<ActivityInfo> ProcessOneJisFileAsIntervals(string path, int interval)
         {
             if (!File.Exists(path))
                 return null;
 
             List<ActivityInfo> jisInfo = new List<ActivityInfo>();
-            List<JisInstance> list = CsvDataLoader.LoadJisFile(path);
+            List<JisInstance> list = loader.LoadJisFile(path);
 
             // data for each faculty
             int[] recordedAmount = new int[TagInfo.faculties.Length];