Revize 260b1217

re #8610 Parsing in intervals dependand on data

Server/ServerApp/Parser/Parsers/DataParser.cs

@@ -59 +59 @@
             string pathLogIn = path + "login";
 
             weatherList = weatherParser.ParseWeatherData(pathWeather, wholeDay, interval);
-            jisList = jisParser.ParseJisData(pathJis, wholeDay, interval);
+            jisList = jisParser.ParseJisData(pathJis, false, 2); // wholeDay, interval);
             loginList = loginParser.ParseLogInData(pathLogIn, wholeDay, interval);
 
-            Console.WriteLine("WEATHER");
-            WriteToConsole(weatherList);
+            //Console.WriteLine("WEATHER");
+            //WriteToConsole(weatherList);
             Console.WriteLine("JIS");
             WriteToConsole(jisList);
-            Console.WriteLine("LOGIN");
-            WriteToConsole(loginList);
+            //Console.WriteLine("LOGIN");
+            //WriteToConsole(loginList);
         }
 
         /// <summary>

Server/ServerApp/Parser/Parsers/JisParser.cs

@@ -39 +39 @@
                     loadedData = ProcessOneJisFileAsDays(fileName);
                 // parse by interval length
                 else
-                {
-                    // pokud: konec dne nebo konec aktuálního intervalu -> vemu to co sem nasčítal
-                    throw new NotImplementedException();
-                }
+                    loadedData = ProcessOneJisFileAsIntervals(fileName, interval);
 
                 list.AddRange(loadedData);
             }
@@ -125 +122 @@
 
         private static List<ActivityInfo> ProcessOneJisFileAsIntervals(string path, int interval)
         {
-            throw new NotImplementedException();
+            if (!File.Exists(path))
+                return null;
+
+            List<ActivityInfo> jisInfo = new List<ActivityInfo>();
+            List<JisInstance> list = CsvDataLoader.LoadJisFile(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];
+
+            if (interval > range)
+                return null;
+
+            int indices = (int) Math.Ceiling(range / (double)interval);
+            int[] from = new int[indices];
+            for (int i = 0; i < from.Length; i++) {
+                from[i] = minmaxHour[0] + interval * (i+1);
+                Console.Write(from[i] + " ");
+            }
+            Console.WriteLine();
+
+            // first day
+            DateTime lastStartTime = new DateTime(list[0].dateTime.Year, list[0].dateTime.Month, list[0].dateTime.Day, minmaxHour[0], 0, 0);
+            for (int i = 0; i < list.Count; i++)
+            {
+                int currHour = list[i].dateTime.Hour;
+                if (currHour < minmaxHour[0] || currHour > minmaxHour[1])
+                    continue;
+
+                // start of the day -> make an instance
+                string place = list[i].placeTag;
+                bool trigger = false;
+                DateTime date = new DateTime(list[i].dateTime.Year, list[i].dateTime.Month, list[i].dateTime.Day, list[i].dateTime.Hour, 0, 0);
+               
+                // end of the day
+                if (!(date.Year == lastStartTime.Year && date.Month == lastStartTime.Month && date.Day == lastStartTime.Day))
+                    trigger = true;
+
+                // end of interval period
+                if ( (date.Hour - lastStartTime.Hour) >= interval || trigger)
+                {
+                    // data for each faculty separate
+                    for (int k = 0; k < TagInfo.faculties.Length; k++)
+                    {
+                        ActivityInfo dayInfo = new ActivityInfo(TagInfo.faculties[k], recordedAmount[k], lastStartTime, interval);
+                        jisInfo.Add(dayInfo);
+                    }
+
+                    recordedAmount = new int[TagInfo.faculties.Length];
+                    lastStartTime = date;
+                }
+
+                // aggregate data
+                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
+                {
+                    // TODO uknown code handling
+                    Console.WriteLine("Unknown code " + list[i].placeTag);
+                }
+
+            }
+
+            // last day
+            for (int k = 0; k < TagInfo.faculties.Length; k++)
+            {
+                ActivityInfo dayInfo = new ActivityInfo(TagInfo.faculties[k], recordedAmount[k], lastStartTime, interval);
+                jisInfo.Add(dayInfo);
+            }
+
+            return jisInfo;
         }
     }
 }