Revize 0da0ac88

Parse data as days - averages, sums

Server/Parser 1.0/Parsers/JisParser.cs

@@ -9 +9 @@
     class JisParser
     {
 
-        static List<JisInfo> ParseJisData(string folder, bool wholeDay = true, int interval = 1)
+        public List<JisInfo> ParseJisData(string folder, bool wholeDay = true, int interval = 1)
         {
             List<JisInfo> list = new List<JisInfo>();
 
@@ -26 +26 @@
                 List<JisInfo> loadedData = null;
                 // pokud po jednom dni
                 if (wholeDay)
-                    loadedData = ProcessOneJisFileAsDays(folder + "/" + fileName);
+                    loadedData = ProcessOneJisFileAsDays(fileName);
                 // pokud po hodinách
                 else
                 {
@@ -48 +48 @@
             List<JisInstance> list =  CsvDataLoader.LoadJisFile(path);
 
             int[] recordedAmount = new int[TagInfo.faculties.Length];
+            int[] minmaxHour = new int[] { 7, 18 };
+            int range = minmaxHour[1] - minmaxHour[0];
 
             // procházet data ze souboru
-            int lastDay = list[0].dateTime.Day;
-            DateTime lastStartTime = list[0].dateTime.Date;
+            DateTime lastStartTime = new DateTime(list[0].dateTime.Year, list[0].dateTime.Month, list[0].dateTime.Day);
             for (int i = 0; i < list.Count; i++)
             {
+                int currHour = list[i].dateTime.Hour;
+                if (currHour < minmaxHour[0] || currHour > minmaxHour[1])
+                    continue;
+
                 // v každym dni agreguju
-                int day = list[i].dateTime.Day;
-                if (lastDay != day)
+                string place = list[i].placeTag;
+                DateTime date = new DateTime(list[i].dateTime.Year, list[i].dateTime.Month, list[i].dateTime.Day);
+                if (!date.Equals(lastStartTime)) 
                 {
                     for (int k = 0; k < TagInfo.faculties.Length; k++)
                     {
-                        JisInfo dayInfo = new JisInfo(TagInfo.faculties[k], recordedAmount[k], lastStartTime, 11);
+                        JisInfo dayInfo = new JisInfo(TagInfo.faculties[k], recordedAmount[k], lastStartTime, range);
                         jisInfo.Add(dayInfo);
                     }
 
                     recordedAmount = new int[TagInfo.faculties.Length];
+                    lastStartTime = date;
                 }
 
                 // tady nasčítávát podle místa
-                if (TagInfo.jisPlaces.ContainsKey(list[i].placeTag))
-                    recordedAmount[TagInfo.jisPlaces[list[i].placeTag]] += list[i].amount;
+                if (TagInfo.jisPlaces.ContainsKey(place))
+                {
+                    int index = TagInfo.jisPlaces[place];
+                    if (index == -1)
+                        for (int l = 0; l < TagInfo.faculties.Length; l++)
+                            recordedAmount[l] += list[i].amount;
+                    else
+                        recordedAmount[index] += list[i].amount;
+
+                }
                 else
                 {
                     Console.WriteLine("Unknown code " + list[i].placeTag);
@@ -77 +92 @@
 
             }
 
+            for (int k = 0; k < TagInfo.faculties.Length; k++)
+            {
+                JisInfo dayInfo = new JisInfo(TagInfo.faculties[k], recordedAmount[k], lastStartTime, range);
+                jisInfo.Add(dayInfo);
+            }
+
+            return jisInfo;
+        }
+
+        private static List<JisInfo> ProcessOneJisFileAsIntervals(string path, int interval)
+        {
             throw new NotImplementedException();
         }
     }