Revize a53b1de8

re #8933 Testing DataParser, JisParser and WeatherParser

Server/ServerApp/DataDownload/DataDownloader.cs

@@ -388 +388 @@
 			if (startDate == null || endDate == null)
 				return GetData(subDirectory);
 
-
 			string[] files = Directory.GetFiles(subDirectory);
 			List<string> found00Files = new List<string>();
 			List<string> relevantFiles = new List<string>();

Server/ServerApp/Parser/InputData/CsvDataLoader.cs

@@ -40 +40 @@
         public List<JisInstance> LoadJisFile(string pathToFile)
         {
             var lines = LoadCsv(pathToFile);
+            if (lines == null)
+                return null;
+
             List<JisInstance> list = new List<JisInstance>();
 
             if (lines == null)
@@ -75 +78 @@
         public List<LogInInstance> LoadLoginFile(string pathToFile)
         {
             var lines = LoadCsv(pathToFile);
+            if (lines == null)
+                return null;
+
             List<LogInInstance> list = new List<LogInInstance>();
 
             if (lines == null)
@@ -120 +126 @@
         public List<WeatherInstance> LoadWeatherFile(string pathToFile)
         {
             var lines = LoadCsv(pathToFile);
+            if (lines == null)
+                return null;
+
             List<WeatherInstance> list = new List<WeatherInstance>();
 
             if (lines == null)

Server/ServerApp/Parser/InputData/IDataLoader.cs

@@ -10 +10 @@
     /// Interface that every DataLoader should implement
     /// </summary>
     /// <author>A. Konig</author>
-    interface IDataLoader
+    public interface IDataLoader
     {
         /// <summary>
         /// Load jis data from file

Server/ServerApp/Parser/InputData/JisInstance.cs

@@ -18 +18 @@
     ///     [place tag];[date time];[amount]
     /// </summary>
     /// <author>A. Konig</author>
-    class JisInstance
+    public class JisInstance
     {
         /// <summary> Place tag  </summary>
         // index 0

Server/ServerApp/Parser/InputData/LogInInstance.cs

@@ -25 +25 @@
     ///     [datum];[amount];[lesson];[lesson start];[lesson end];[building];[room type];[room];[hostname]
     /// </summary>
     /// <author>A. Konig</author>
-    class LogInInstance
+    public class LogInInstance
     {
         /// <summary> Date time </summary>
         // index 0

Server/ServerApp/Parser/InputData/WeatherInstance.cs

@@ -14 +14 @@
     ///     [date time];[temperature];[wind];[rain];[luminance]
     /// </summary>
     /// <author>A. Konig</author>
-    class WeatherInstance
+    public class WeatherInstance
     {
         /// <summary> Date and time </summary>
         // index 0
@@ -48 +48 @@
             this.rain = rain;
             this.lum = lum;
         }
+
+        /// <summary>
+        /// Eqquals
+        /// </summary>
+        /// <param name="obj"> Other object </param>
+        /// <returns></returns>
+        public override bool Equals(object obj)
+        {
+            WeatherInstance other = (WeatherInstance) obj;
+
+            if (dateTime == other.dateTime && temp == other.temp && wind == other.wind && rain == other.rain && lum == other.lum)
+                return true;
+
+            return false;
+        }
     }
 }

Server/ServerApp/Parser/OutputInfo/ActivityInfo.cs

@@ -45 +45 @@
         {
             return $"{startTime} \t {building} \t {amount}";
         }
+
+
+        /// <summary>
+        /// Compares object to other instance
+        /// </summary>
+        /// <param name="obj"></param>
+        /// <returns></returns>
+        public override bool Equals(object obj)
+        {
+            ActivityInfo other = (ActivityInfo)obj;
+
+            if (building == other.building && amount == other.amount && startTime == other.startTime && intervalLength == other.intervalLength)
+                return true;
+
+            return false;
+        }
     }
 }

Server/ServerApp/Parser/OutputInfo/ValueToConditions.cs

@@ -35 +35 @@
         /// </summary>
         /// <param name="condition">Weather conditions</param>
         /// <returns>Lux value</returns>
-        internal static double TransferConditionsToLux(WeatherConditions condition)
+        public static double TransferConditionsToLux(WeatherConditions condition)
         {
             if (condition == WeatherConditions.Sunny)
                 return 60_000;

Server/ServerApp/Parser/OutputInfo/WeatherInfo.cs

@@ -85 +85 @@
             return $"{startTime} \t {temp}°C \t {rain}% \t {wind}m/s \t {condition.ToString()} \t {lum}";
         }
 
+        /// <summary>
+        /// Eqquals
+        /// </summary>
+        /// <param name="obj"> Other object </param>
+        /// <returns></returns>
+        public override bool Equals(object obj)
+        {
+            WeatherInfo other = (WeatherInfo) obj;
+
+            if (startTime == other.startTime && temp == other.temp && wind == other.wind && rain == other.rain && condition == other.condition)
+                return true;
+
+            return false;
+        }
     }
 }

Server/ServerApp/Parser/Parsers/DataParser.cs

@@ -34 +34 @@
         /// <summary> ActivityInfo representing login activity</summary>
         List<ActivityInfo> loginList;
 
-
         /// <summary>
         /// Constructor
         /// </summary>
@@ -70 +69 @@
             string pathLogIn = downloader.DataSubDirectories[DataType.STROJE];
 
             // get all files that should be parsed
-            Date start = null;
-            Date end = null;
-            if (startTime != null || endTime != null)
+            Date start = new Date((uint)startTime.Month, (uint)startTime.Year);
+            Date end = new Date((uint)endTime.Month, (uint)endTime.Year);
+            if (startTime == DateTime.MinValue || endTime == DateTime.MaxValue)
             {
-                start = new Date((uint)startTime.Month, (uint)startTime.Year);
-                end = new Date((uint)endTime.Month, (uint)endTime.Year);
+                start = null;
+                end = null;
             }
 
             var weatherFiles = downloader.GetData(pathWeather, start, end);
@@ -183 +182 @@
                     
                     
             if (indexLogin < loginList.Count)
-                res.AddRange(jisList.GetRange(indexLogin, loginList.Count - indexLogin));
+                res.AddRange(loginList.GetRange(indexLogin, loginList.Count - indexLogin));
 
             return res;
         }

Server/ServerApp/Parser/Parsers/JisParser.cs

@@ -15 +15 @@
     /// Data parsed from 7am (included) to 18pm (included)
     /// </summary>
     /// <author>A. Konig</author>
-    class JisParser
+    public class JisParser
     {
 
         /// <summary> Datafile loader  </summary>
@@ -78 +78 @@
         {
             List<ActivityInfo> jisInfo = new List<ActivityInfo>();
             
-            if (!File.Exists(path))
-                return jisInfo;
-
             List<JisInstance> list =  loader.LoadJisFile(path);
+            if (list == null)
+                return jisInfo;
 
             // data for each faculty
             int[] recordedAmount = new int[TagInfo.buildings.Length];
@@ -107 +106 @@
                     for (int k = 0; k < TagInfo.buildings.Length; k++)
                     {
                         ActivityInfo dayInfo = new ActivityInfo(TagInfo.buildings[k], recordedAmount[k], lastStartTime, range);
-                        jisInfo.Add(dayInfo);
+                        if (recordedAmount[k] != 0)
+                            jisInfo.Add(dayInfo);
                     }
 
                     recordedAmount = new int[TagInfo.buildings.Length];
@@ -141 +141 @@
             for (int k = 0; k < TagInfo.buildings.Length; k++)
             {
                 ActivityInfo dayInfo = new ActivityInfo(TagInfo.buildings[k], recordedAmount[k], lastStartTime, range);
-                jisInfo.Add(dayInfo);
+                if (recordedAmount[k] != 0)
+                    jisInfo.Add(dayInfo);
             }
 
             return jisInfo;
@@ -158 +159 @@
         private List<ActivityInfo> ProcessOneJisFileAsIntervals(string path, int interval, DateTime startTime, DateTime endTime)
         {
             List<ActivityInfo> jisInfo = new List<ActivityInfo>();
-            
-            if (!File.Exists(path))
-                return jisInfo;
 
             List<JisInstance> list = loader.LoadJisFile(path);
+            if (list == null)
+                return jisInfo;
 
             // data for each faculty
             int[] recordedAmount = new int[TagInfo.buildings.Length];
@@ -207 +207 @@
                     // start time of last interval
                     DateTime stTime = new DateTime(lastStartTime.Year, lastStartTime.Month, lastStartTime.Day, startingTime, 0, 0);
 
+                    // TODO zjistit kolik se vynechalo a přidat tolik nul?
+
                     // find end and start time
                     if (!trigger)
                         index++;
@@ -223 +225 @@
                     for (int k = 0; k < TagInfo.buildings.Length; k++)
                     {
                         ActivityInfo dayInfo = new ActivityInfo(TagInfo.buildings[k], recordedAmount[k], stTime, interval);
-                        jisInfo.Add(dayInfo);
+                        if (recordedAmount[k] != 0)
+                            jisInfo.Add(dayInfo);
                     }
 
                     recordedAmount = new int[TagInfo.buildings.Length];
@@ -254 +257 @@
             }
 
             // last day
+            DateTime startT = new DateTime(lastStartTime.Year, lastStartTime.Month, lastStartTime.Day, startingTime, 0, 0);
             for (int k = 0; k < TagInfo.buildings.Length; k++)
             {
-                ActivityInfo dayInfo = new ActivityInfo(TagInfo.buildings[k], recordedAmount[k], lastStartTime, interval);
-                jisInfo.Add(dayInfo);
+                ActivityInfo dayInfo = new ActivityInfo(TagInfo.buildings[k], recordedAmount[k], startT, interval);
+                if (recordedAmount[k] != 0)
+                    jisInfo.Add(dayInfo);
             }
 
             return jisInfo;

Server/ServerApp/Parser/Parsers/LogInParser.cs

@@ -77 +77 @@
         {
             List<ActivityInfo> loginInfo = new List<ActivityInfo>();
 
-            if (!File.Exists(path))
-                return loginInfo;
-
             List<LogInInstance> list = loader.LoadLoginFile(path);
+            if (list == null)
+                return loginInfo;
 
             // data for each faculty
             int[] recordedAmount = new int[TagInfo.buildings.Length];
@@ -161 +160 @@
         {
             List<ActivityInfo> loginInfo = new List<ActivityInfo>();
             
-            if (!File.Exists(path))
-                return loginInfo;
-
             List<LogInInstance> list = loader.LoadLoginFile(path);
+            if (list == null)
+                return loginInfo;
 
             // min/max hour taken into account
             int[] minmaxHour = new int[] { 7, 18 };

Server/ServerApp/Parser/Parsers/TagInfo.cs

@@ -10 +10 @@
     /// Class with Tags used in application
     /// </summary>
     /// <author>Alex Konig</author>
-    class TagInfo
+    public class TagInfo
     {
         public static string[] buildings;
 

Server/ServerApp/Parser/Parsers/WeatherParser.cs

@@ -15 +15 @@
     /// Data parsed from 7am (included) to 18pm (included)
     /// </summary>
     /// <author>A. Konig</author>
-    class WeatherParser
+    public class WeatherParser
     {
 
         /// <summary> Datafile loader  </summary>
@@ -44 +44 @@
         {
             List<WeatherInfo> list = new List<WeatherInfo>();
 
-            if (weatherFiles == null || startTime == null || endTime == null || interval <= 0)
+            if (weatherFiles == null || interval <= 0)
                 return list;
 
             // get all files in folder
@@ -80 +80 @@
         {
             List<WeatherInfo> weatherInfo = new List<WeatherInfo>();
 
-            if (!File.Exists(path))
-                return weatherInfo;
-
             List<WeatherInstance> list = loader.LoadWeatherFile(path);
+            if (list == null)
+                return weatherInfo;
 
             // array with data [temp, rain, wind, lum]
             double[] recordedAmount = new double[4];
@@ -116 +115 @@
                 }
 
                 // if not in allowed time window -> discard
-                if (list[i].dateTime < startTime|| list[i].dateTime > endTime)
+                if (list[i].dateTime < startTime || list[i].dateTime > endTime)
+                {
                     continue;
+                }
 
                 // aggregate data
                 recordedAmount[0] += list[i].temp;
@@ -125 +126 @@
                 recordedAmount[2] += list[i].wind;
 
                 if (ValueToConditions.TransferLuxToConditions(list[i].lum * 1000) != WeatherConditions.Dark)
+                {
                     recordedAmount[3] += list[i].lum * 1000; weatherValues++;
+                }
 
                 values++;
             }
 
             // data from last day
-            WeatherInfo dayInfo2 = new WeatherInfo(lastStartDay, recordedAmount[0] / values, (int)(recordedAmount[1] / values * 100), recordedAmount[2] / values, recordedAmount[3] / values, range); 
-            weatherInfo.Add(dayInfo2);
+            if (values != 0)
+            {
+                WeatherInfo dayInfo2 = new WeatherInfo(lastStartDay, recordedAmount[0] / values, (int)(recordedAmount[1] / values * 100), recordedAmount[2] / values, recordedAmount[3] / weatherValues, range);
+                weatherInfo.Add(dayInfo2);
+            }
 
             return weatherInfo;
         }
@@ -149 +155 @@
         {
             List<WeatherInfo> weatherInfo = new List<WeatherInfo>();
 
-            if (!File.Exists(path))
-                return weatherInfo;
-
             List<WeatherInstance> list = loader.LoadWeatherFile(path);
+            if (list == null)
+                return weatherInfo;
 
             // min/max hour taken into account
             int[] minmaxHour = new int[] { 7, 18 };
@@ -169 +174 @@
             {
                 to[i] = minmaxHour[0] + interval * (i + 1);
                 data[i] = new double[4];
+                count[i] = 0;
             }
 
             // first day
@@ -208 +214 @@
                     lastStartTime = date;
                     count = new int[indices];
                     for (int l = 0; l < data.Length; l++)
+                    {
                         data[l] = new double[4];
+                        count[l] = 0;
+                    }
                 }
 
                 // if not in allowed time window -> discard

Server/ServerApp/Program.cs

@@ -33 +33 @@
         {
 
 			// SETUP FOLDERS
-
 			Config config = FillConfigInfo(args);
 			if (config == null)
 			{

Server/TestProject/ParserTests/TestingParser.cs

@@ +1 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using System;
+using ServerApp.Parser.Parsers;
+using System.Collections.Generic;
+using ServerApp.Parser.OutputInfo;
+using Moq;
+using ServerApp.Parser.InputData;
+
+// 1h
+// 0.5h to edit parsers 
+
+namespace TestProject
+{
+
+    [TestClass]
+    public class TestingParser
+    {
+        [TestMethod]
+        public void AbstactClassTest()
+        {
+            IDataParser p = new DataParser(null);
+            List<ActivityInfo> aa = p.AttendanceList;
+            List<WeatherInfo> wa = p.WeatherList;
+
+            DataParser pp = (DataParser)p;
+            List<ActivityInfo> ap = pp.AttendanceList;
+            List<WeatherInfo> wp = pp.WeatherList;
+
+            Assert.AreEqual(aa, ap);
+            Assert.AreEqual(wa, wp);
+        }
+
+        // ------------------------------------ MERGE LISTS -------------------------------------
+
+        #region Merge lists
+        [TestMethod]
+        public void MergeListsNull()
+        {
+            DataParser target = new DataParser(null);
+            PrivateObject obj = new PrivateObject(target);
+
+            List<ActivityInfo> jis = null;
+            List<ActivityInfo> pc = null;
+
+            List<ActivityInfo> retVal = (List<ActivityInfo>)obj.Invoke("MergeAttendance", jis, pc);
+            Assert.AreEqual(0, retVal.Count);
+        }
+
+        [TestMethod]
+        public void MergeListsJisNull()
+        {
+            DataParser target = new DataParser(null);
+            PrivateObject obj = new PrivateObject(target);
+
+            List<ActivityInfo> jis = null;
+            List<ActivityInfo> pc = new List<ActivityInfo>();
+
+            List<ActivityInfo> retVal = (List<ActivityInfo>)obj.Invoke("MergeAttendance", jis, pc);
+            Assert.AreEqual(pc, retVal);
+        }
+
+        [TestMethod]
+        public void MergeListsPcNull()
+        {
+            DataParser target = new DataParser(null);
+            PrivateObject obj = new PrivateObject(target);
+
+            List<ActivityInfo> jis = new List<ActivityInfo>();
+            List<ActivityInfo> pc = null;
+
+            List<ActivityInfo> retVal = (List<ActivityInfo>)obj.Invoke("MergeAttendance", jis, pc);
+            Assert.AreEqual(jis, retVal);
+        }
+
+        [TestMethod]
+        public void MergeListsOneNoOverlap()
+        {
+            DataParser target = new DataParser(null);
+            PrivateObject obj = new PrivateObject(target);
+
+            List<ActivityInfo> jis = new List<ActivityInfo>();
+            List<ActivityInfo> pc = new List<ActivityInfo>();
+
+            jis.Add(new ActivityInfo("FAV", 5, new DateTime(2001, 1, 1, 15, 0, 0), 3));
+            pc.Add(new ActivityInfo("FAV", 3, new DateTime(2001, 1, 1, 18, 0, 0), 3));
+
+            List<ActivityInfo> retVal = (List<ActivityInfo>)obj.Invoke("MergeAttendance", jis, pc);
+
+            Assert.AreEqual(2, retVal.Count);
+            Assert.AreEqual(new ActivityInfo("FAV", 5, new DateTime(2001, 1, 1, 15, 0, 0), 3), retVal[0]);
+            Assert.AreEqual(new ActivityInfo("FAV", 3, new DateTime(2001, 1, 1, 18, 0, 0), 3), retVal[1]);
+        }
+
+        [TestMethod]
+        public void MergeListsOneOverlap()
+        {
+            DataParser target = new DataParser(null);
+            PrivateObject obj = new PrivateObject(target);
+
+            List<ActivityInfo> jis = new List<ActivityInfo>();
+            List<ActivityInfo> pc = new List<ActivityInfo>();
+
+            jis.Add(new ActivityInfo("FAV", 5, new DateTime(2001, 1, 1, 15, 0, 0), 3));
+            pc.Add(new ActivityInfo("FAV", 3, new DateTime(2001, 1, 1, 15, 0, 0), 3));
+
+            List<ActivityInfo> retVal = (List<ActivityInfo>)obj.Invoke("MergeAttendance", jis, pc);
+
+            Assert.AreEqual(1, retVal.Count);
+            Assert.AreEqual(new ActivityInfo("FAV", 8, new DateTime(2001, 1, 1, 15, 0, 0), 3), retVal[0]);
+        }
+
+        [TestMethod]
+        public void MergeListsTwoNoOverlap()
+        {
+            DataParser target = new DataParser(null);
+            PrivateObject obj = new PrivateObject(target);
+
+            List<ActivityInfo> jis = new List<ActivityInfo>();
+            List<ActivityInfo> pc = new List<ActivityInfo>();
+
+            jis.Add(new ActivityInfo("FAV", 5, new DateTime(2001, 1, 1, 9, 0, 0), 3));
+            jis.Add(new ActivityInfo("FAV", 1, new DateTime(2001, 1, 1, 15, 0, 0), 3));
+            pc.Add(new ActivityInfo("FAV", 3, new DateTime(2001, 1, 1, 12, 0, 0), 3));
+            pc.Add(new ActivityInfo("FAV", 2, new DateTime(2001, 1, 1, 18, 0, 0), 3));
+
+            List<ActivityInfo> retVal = (List<ActivityInfo>)obj.Invoke("MergeAttendance", jis, pc);
+
+            Assert.AreEqual(4, retVal.Count);
+            Assert.AreEqual(new ActivityInfo("FAV", 5, new DateTime(2001, 1, 1, 9, 0, 0), 3), retVal[0]);
+            Assert.AreEqual(new ActivityInfo("FAV", 3, new DateTime(2001, 1, 1, 12, 0, 0), 3), retVal[1]);
+            Assert.AreEqual(new ActivityInfo("FAV", 1, new DateTime(2001, 1, 1, 15, 0, 0), 3), retVal[2]);
+            Assert.AreEqual(new ActivityInfo("FAV", 2, new DateTime(2001, 1, 1, 18, 0, 0), 3), retVal[3]);
+        }
+
+        [TestMethod]
+        public void MergeListsTwoOverlap()
+        {
+            DataParser target = new DataParser(null);
+            PrivateObject obj = new PrivateObject(target);
+
+            List<ActivityInfo> jis = new List<ActivityInfo>();
+            List<ActivityInfo> pc = new List<ActivityInfo>();
+
+            jis.Add(new ActivityInfo("FAV", 5, new DateTime(2001, 1, 1, 9, 0, 0), 3));
+            jis.Add(new ActivityInfo("FAV", 1, new DateTime(2001, 1, 1, 15, 0, 0), 3));
+            pc.Add(new ActivityInfo("FAV", 3, new DateTime(2001, 1, 1, 12, 0, 0), 3));
+            pc.Add(new ActivityInfo("FAV", 2, new DateTime(2001, 1, 1, 15, 0, 0), 3));
+
+            List<ActivityInfo> retVal = (List<ActivityInfo>)obj.Invoke("MergeAttendance", jis, pc);
+
+            Assert.AreEqual(3, retVal.Count);
+            Assert.AreEqual(new ActivityInfo("FAV", 5, new DateTime(2001, 1, 1, 9, 0, 0), 3), retVal[0]);
+            Assert.AreEqual(new ActivityInfo("FAV", 3, new DateTime(2001, 1, 1, 12, 0, 0), 3), retVal[1]);
+            Assert.AreEqual(new ActivityInfo("FAV", 3, new DateTime(2001, 1, 1, 15, 0, 0), 3), retVal[2]);
+        }
+
+        [TestMethod]
+        public void MergeListsMultiple()
+        {
+            DataParser target = new DataParser(null);
+            PrivateObject obj = new PrivateObject(target);
+
+            List<ActivityInfo> jis = new List<ActivityInfo>();
+            List<ActivityInfo> pc = new List<ActivityInfo>();
+
+            jis.Add(new ActivityInfo("FAV", 5, new DateTime(2000, 1, 10, 9, 0, 0), 3));
+            jis.Add(new ActivityInfo("FAV", 1, new DateTime(2001, 1, 1, 15, 0, 0), 3));
+            jis.Add(new ActivityInfo("FDU", 3, new DateTime(2001, 4, 1, 15, 0, 0), 3));
+
+            pc.Add(new ActivityInfo("FAV", 3, new DateTime(2001, 1, 1, 12, 0, 0), 3));
+            pc.Add(new ActivityInfo("FAV", 2, new DateTime(2001, 1, 1, 15, 0, 0), 3));
+            pc.Add(new ActivityInfo("FAV", 5, new DateTime(2001, 4, 1, 15, 0, 0), 3));
+
+            List<ActivityInfo> retVal = (List<ActivityInfo>)obj.Invoke("MergeAttendance", jis, pc);
+
+            Assert.AreEqual(5, retVal.Count);
+            Assert.AreEqual(new ActivityInfo("FAV", 5, new DateTime(2000, 1, 10, 9, 0, 0), 3), retVal[0]);
+            Assert.AreEqual(new ActivityInfo("FAV", 3, new DateTime(2001, 1, 1, 12, 0, 0), 3), retVal[1]);
+            Assert.AreEqual(new ActivityInfo("FAV", 3, new DateTime(2001, 1, 1, 15, 0, 0), 3), retVal[2]);
+            Assert.AreEqual(new ActivityInfo("FDU", 3, new DateTime(2001, 4, 1, 15, 0, 0), 3), retVal[3]);
+            Assert.AreEqual(new ActivityInfo("FAV", 5, new DateTime(2001, 4, 1, 15, 0, 0), 3), retVal[4]);
+        }
+        #endregion
+
+        // ------------------------------ WEATHER PARSER ----------------------------------------
+
+        #region Weather parser
+
+        #region Parse days
+        [TestMethod]
+        public void ParseWeatherDayOne()
+        {
+            string path = "";
+            List<WeatherInstance> data = new List<WeatherInstance>();
+            data.Add(new WeatherInstance(new DateTime(2000, 1, 1, 8, 0, 0), 5, 0, 1, ValueToConditions.TransferConditionsToLux(WeatherConditions.Overcast)/1000));
+            data.Add(new WeatherInstance(new DateTime(2000, 1, 1, 9, 0, 0), 7, 0, 1, ValueToConditions.TransferConditionsToLux(WeatherConditions.Overcast)/1000));
+            data.Add(new WeatherInstance(new DateTime(2000, 1, 1, 10, 0, 0), 10, 3, 0, ValueToConditions.TransferConditionsToLux(WeatherConditions.Overcast)/1000));
+            data.Add(new WeatherInstance(new DateTime(2000, 1, 1, 12, 0, 0), 10, 2, 0, ValueToConditions.TransferConditionsToLux(WeatherConditions.Overcast)/1000));
+
+            Mock<IDataLoader> dl = new Mock<IDataLoader>();
+            dl.Setup(m => m.LoadWeatherFile(path)).Returns(data);
+
+            WeatherParser target = new WeatherParser(dl.Object);
+            PrivateObject obj = new PrivateObject(target);
+
+            List<WeatherInfo> retVal = (List<WeatherInfo>)obj.Invoke("ProcessOneWeatherFileAsDays", path, new DateTime(2000, 1, 1), new DateTime(2001, 1, 1));
+
+            Assert.AreEqual(1, retVal.Count);
+            Assert.AreEqual(new WeatherInfo(new DateTime(2000, 1, 1, 7, 0, 0), 8, 50, 1.25, 10_000, 18-7), retVal[0]);
+        }
+
+        [TestMethod]
+        public void ParseWeatherDayOneFiltering()
+        {
+            string path = "";
+            List<WeatherInstance> data = new List<WeatherInstance>();
+            data.Add(new WeatherInstance(new DateTime(2000, 1, 1, 8, 0, 0), 5, 0, 1, ValueToConditions.TransferConditionsToLux(WeatherConditions.Dark) / 1000));
+
+            data.Add(new WeatherInstance(new DateTime(2000, 1, 1, 9, 0, 0), 7, 0, 1, ValueToConditions.TransferConditionsToLux(WeatherConditions.Dark) / 1000));
+            data.Add(new WeatherInstance(new DateTime(2000, 1, 1, 10, 0, 0), 10, 3, 0, ValueToConditions.TransferConditionsToLux(WeatherConditions.Overcast) / 1000));
+            data.Add(new WeatherInstance(new DateTime(2000, 1, 1, 12, 0, 0), 10, 2, 0, ValueToConditions.TransferConditionsToLux(WeatherConditions.Overcast) / 1000));
+            data.Add(new WeatherInstance(new DateTime(2000, 1, 1, 13, 0, 0), 12, 2, 0, ValueToConditions.TransferConditionsToLux(WeatherConditions.Overcast) / 1000));
+            
+            data.Add(new WeatherInstance(new DateTime(2000, 1, 1, 16, 0, 0), 15, 2, 1, ValueToConditions.TransferConditionsToLux(WeatherConditions.Overcast) / 1000));
+
+            Mock<IDataLoader> dl = new Mock<IDataLoader>();
+            dl.Setup(m => m.LoadWeatherFile(path)).Returns(data);
+
+            WeatherParser target = new WeatherParser(dl.Object);
+            PrivateObject obj = new PrivateObject(target);
+
+            List<ActivityInfo> jis = new List<ActivityInfo>();
+            List<ActivityInfo> pc = new List<ActivityInfo>();
+
+            List<WeatherInfo> retVal = (List<WeatherInfo>)obj.Invoke("ProcessOneWeatherFileAsDays", path, new DateTime(2000, 1, 1, 9, 0, 0), new DateTime(2000, 1, 1, 15, 0, 0));
+
+            Assert.AreEqual(1, retVal.Count);
+            Assert.AreEqual(new WeatherInfo(new DateTime(2000, 1, 1, 7, 0, 0), 9.75, 25, 1.75, 10_000, 18 - 7), retVal[0]);
+        }
+
+        [TestMethod]
+        public void ParseWeatherDayTwo()
+        {
+            string path = "";
+            List<WeatherInstance> data = new List<WeatherInstance>();
+            data.Add(new WeatherInstance(new DateTime(2000, 1, 1, 8, 0, 0), 5, 0, 1, ValueToConditions.TransferConditionsToLux(WeatherConditions.Dark) / 1000));
+            data.Add(new WeatherInstance(new DateTime(2000, 1, 1, 9, 0, 0), 10, 0, 1, ValueToConditions.TransferConditionsToLux(WeatherConditions.Dark) / 1000));
+            data.Add(new WeatherInstance(new DateTime(2000, 1, 1, 10, 0, 0), 3, 3, 1, ValueToConditions.TransferConditionsToLux(WeatherConditions.Overcast) / 1000));
+
+            data.Add(new WeatherInstance(new DateTime(2000, 2, 1, 12, 0, 0), 5, 2, 0, ValueToConditions.TransferConditionsToLux(WeatherConditions.Overcast) / 1000));
+            data.Add(new WeatherInstance(new DateTime(2000, 2, 1, 13, 0, 0), 10, 2, 0, ValueToConditions.TransferConditionsToLux(WeatherConditions.Overcast) / 1000));
+            data.Add(new WeatherInstance(new DateTime(2000, 2, 1, 13, 0, 0), 10, 2, 0, ValueToConditions.TransferConditionsToLux(WeatherConditions.Overcast) / 1000));
+            data.Add(new WeatherInstance(new DateTime(2000, 2, 1, 16, 0, 0), 15, 2, 1, ValueToConditions.TransferConditionsToLux(WeatherConditions.Overcast) / 1000));
+
+
+            Mock<IDataLoader> dl = new Mock<IDataLoader>();
+            dl.Setup(m => m.LoadWeatherFile(path)).Returns(data);
+
+            WeatherParser target = new WeatherParser(dl.Object);
+            PrivateObject obj = new PrivateObject(target);
+
+            List<ActivityInfo> jis = new List<ActivityInfo>();
+            List<ActivityInfo> pc = new List<ActivityInfo>();
+
+            List<WeatherInfo> retVal = (List<WeatherInfo>)obj.Invoke("ProcessOneWeatherFileAsDays", path, new DateTime(2000, 1, 1), new DateTime(2001, 1, 1));
+
+            Assert.AreEqual(2, retVal.Count);
+            Assert.AreEqual(new WeatherInfo(new DateTime(2000, 1, 1, 7, 0, 0), 6, 100, 1, 10_000, 18-7), retVal[0]);
+            Assert.AreEqual(new WeatherInfo(new DateTime(2000, 2, 1, 7, 0, 0), 10, 25, 2, 10_000, 18-7), retVal[1]);
+        }
+
+        [TestMethod]
+        public void ParseWeatherDayTwoFiltering()
+        {
+            string path = "";
+            List<WeatherInstance> data = new List<WeatherInstance>();
+            data.Add(new WeatherInstance(new DateTime(2000, 1, 1, 8, 0, 0), 5, 0, 1, ValueToConditions.TransferConditionsToLux(WeatherConditions.Dark) / 1000));
+            data.Add(new WeatherInstance(new DateTime(2000, 1, 1, 9, 0, 0), 10, 0, 1, ValueToConditions.TransferConditionsToLux(WeatherConditions.Dark) / 1000));
+            data.Add(new WeatherInstance(new DateTime(2000, 1, 1, 10, 0, 0), 3, 3, 1, ValueToConditions.TransferConditionsToLux(WeatherConditions.Overcast) / 1000));
+
+            data.Add(new WeatherInstance(new DateTime(2000, 2, 1, 12, 0, 0), 5, 2, 0, ValueToConditions.TransferConditionsToLux(WeatherConditions.Overcast) / 1000));
+            data.Add(new WeatherInstance(new DateTime(2000, 2, 1, 13, 0, 0), 10, 2, 0, ValueToConditions.TransferConditionsToLux(WeatherConditions.Overcast) / 1000));
+            data.Add(new WeatherInstance(new DateTime(2000, 2, 1, 13, 0, 0), 10, 2, 0, ValueToConditions.TransferConditionsToLux(WeatherConditions.Overcast) / 1000));
+            data.Add(new WeatherInstance(new DateTime(2000, 2, 1, 16, 0, 0), 15, 2, 1, ValueToConditions.TransferConditionsToLux(WeatherConditions.Overcast) / 1000));
+
+
+            Mock<IDataLoader> dl = new Mock<IDataLoader>();
+            dl.Setup(m => m.LoadWeatherFile(path)).Returns(data);
+
+            WeatherParser target = new WeatherParser(dl.Object);
+            PrivateObject obj = new PrivateObject(target);
+
+            List<ActivityInfo> jis = new List<ActivityInfo>();
+            List<ActivityInfo> pc = new List<ActivityInfo>();
+
+            List<WeatherInfo> retVal = (List<WeatherInfo>)obj.Invoke("ProcessOneWeatherFileAsDays", path, new DateTime(2000, 1, 1, 8, 0, 0), new DateTime(2000, 1, 1, 11, 0, 0));
+
+            Assert.AreEqual(1, retVal.Count);
+            Assert.AreEqual(new WeatherInfo(new DateTime(2000, 1, 1, 7, 0, 0), 6, 100, 1, 10_000, 18 - 7), retVal[0]);
+            //Assert.AreEqual(new WeatherInfo(new DateTime(2000, 2, 1, 7, 0, 0), 10, 25, 2, 10_000, 18 - 7), retVal[1]);
+        }
+        #endregion
+
+        #region Parse hours
+        [TestMethod]
+        public void ParseWeatherHourOne()
+        {
+            string path = "";
+            List<WeatherInstance> data = new List<WeatherInstance>();
+            
+            // day 1
+            data.Add(new WeatherInstance(new DateTime(2000, 1, 1, 8, 0, 0), 5, 0, 1, ValueToConditions.TransferConditionsToLux(WeatherConditions.Dark) / 1000));
+
+
+            Mock<IDataLoader> dl = new Mock<IDataLoader>();
+            dl.Setup(m => m.LoadWeatherFile(path)).Returns(data);
+
+            WeatherParser target = new WeatherParser(dl.Object);
+            PrivateObject obj = new PrivateObject(target);
+
+            List<ActivityInfo> jis = new List<ActivityInfo>();
+            List<ActivityInfo> pc = new List<ActivityInfo>();
+
+            List<WeatherInfo> retVal = (List<WeatherInfo>)obj.Invoke("ProcessOneWeatherFileAsIntervals", path, 2, new DateTime(2000, 1, 1, 8, 0, 0), new DateTime(2001, 1, 1, 11, 0, 0));
+
+            Assert.AreEqual(1, retVal.Count);
+            Assert.AreEqual(new WeatherInfo(new DateTime(2000, 1, 1, 7, 0, 0),  5, 100, 0, (double)0, 2), retVal[0]);
+        }
+
+        [TestMethod]
+        public void ParseWeatherHourMultiple()
+        {
+            string path = "";
+            List<WeatherInstance> data = new List<WeatherInstance>();
+
+            // day 1
+            data.Add(new WeatherInstance(new DateTime(2000, 1, 1, 8, 0, 0), 5, 0, 1, ValueToConditions.TransferConditionsToLux(WeatherConditions.Dark) / 1000));
+
+            data.Add(new WeatherInstance(new DateTime(2000, 1, 1, 9, 0, 0), 10, 0, 1, ValueToConditions.TransferConditionsToLux(WeatherConditions.Dark) / 1000));
+            data.Add(new WeatherInstance(new DateTime(2000, 1, 1, 10, 0, 0), 3, 3, 1, ValueToConditions.TransferConditionsToLux(WeatherConditions.Overcast) / 1000));
+
+            // day 2
+            data.Add(new WeatherInstance(new DateTime(2000, 2, 1, 12, 0, 0), 5, 2, 0, ValueToConditions.TransferConditionsToLux(WeatherConditions.Sunny) / 1000));
+
+            data.Add(new WeatherInstance(new DateTime(2000, 2, 1, 13, 0, 0), 10, 2, 1, ValueToConditions.TransferConditionsToLux(WeatherConditions.Overcast) / 1000));
+            data.Add(new WeatherInstance(new DateTime(2000, 2, 1, 13, 0, 0), 10, 2, 0, ValueToConditions.TransferConditionsToLux(WeatherConditions.Overcast) / 1000));
+            data.Add(new WeatherInstance(new DateTime(2000, 2, 1, 13, 15, 0), 10, 2, 0, ValueToConditions.TransferConditionsToLux(WeatherConditions.Overcast) / 1000));
+
+            data.Add(new WeatherInstance(new DateTime(2000, 2, 1, 16, 0, 0), 15, 2, 1, ValueToConditions.TransferConditionsToLux(WeatherConditions.Overcast) / 1000));
+
+
+            Mock<IDataLoader> dl = new Mock<IDataLoader>();
+            dl.Setup(m => m.LoadWeatherFile(path)).Returns(data);
+
+            WeatherParser target = new WeatherParser(dl.Object);
+            PrivateObject obj = new PrivateObject(target);
+
+            List<ActivityInfo> jis = new List<ActivityInfo>();
+            List<ActivityInfo> pc = new List<ActivityInfo>();
+
+            List<WeatherInfo> retVal = (List<WeatherInfo>)obj.Invoke("ProcessOneWeatherFileAsIntervals", path, 2, new DateTime(2000, 1, 1, 8, 0, 0), new DateTime(2001, 1, 1, 11, 0, 0));
+
+            Assert.AreEqual(5, retVal.Count);
+            Assert.AreEqual(new WeatherInfo(new DateTime(2000, 1, 1, 7, 0, 0), 5, 100, 0, (double)0, 2), retVal[0]);
+            Assert.AreEqual(new WeatherInfo(new DateTime(2000, 1, 1, 9, 0, 0), 6.5, 100, 1.5, 10_000, 2), retVal[1]);
+            Assert.AreEqual(new WeatherInfo(new DateTime(2000, 2, 1, 11, 0, 0), 5, 0, 2, 60_000, 2), retVal[2]);
+            Assert.AreEqual(new WeatherInfo(new DateTime(2000, 2, 1, 13, 0, 0), 10, 25, 2, 10_000, 2), retVal[3]);
+            Assert.AreEqual(new WeatherInfo(new DateTime(2000, 2, 1, 15, 0, 0), 15, 40, 2, 10_000, 2), retVal[4]);
+        }
+
+
+        [TestMethod]
+        public void ParseWeatherHourFiltering()
+        {
+            string path = "";
+            List<WeatherInstance> data = new List<WeatherInstance>();
+
+            // day 1
+            data.Add(new WeatherInstance(new DateTime(2000, 1, 1, 8, 0, 0), 5, 0, 1, ValueToConditions.TransferConditionsToLux(WeatherConditions.Dark) / 1000));
+
+            data.Add(new WeatherInstance(new DateTime(2000, 1, 1, 9, 0, 0), 10, 0, 1, ValueToConditions.TransferConditionsToLux(WeatherConditions.Dark) / 1000));
+            data.Add(new WeatherInstance(new DateTime(2000, 1, 1, 10, 0, 0), 3, 3, 1, ValueToConditions.TransferConditionsToLux(WeatherConditions.Overcast) / 1000));
+
+            // day 2
+            data.Add(new WeatherInstance(new DateTime(2000, 2, 1, 12, 0, 0), 5, 2, 0, ValueToConditions.TransferConditionsToLux(WeatherConditions.Sunny) / 1000));
+
+            data.Add(new WeatherInstance(new DateTime(2000, 2, 1, 13, 0, 0), 10, 2, 1, ValueToConditions.TransferConditionsToLux(WeatherConditions.Overcast) / 1000));
+            data.Add(new WeatherInstance(new DateTime(2000, 2, 1, 13, 0, 0), 10, 2, 0, ValueToConditions.TransferConditionsToLux(WeatherConditions.Overcast) / 1000));
+            data.Add(new WeatherInstance(new DateTime(2000, 2, 1, 13, 15, 0), 10, 2, 0, ValueToConditions.TransferConditionsToLux(WeatherConditions.Overcast) / 1000));
+
+            data.Add(new WeatherInstance(new DateTime(2000, 2, 1, 16, 0, 0), 15, 2, 1, ValueToConditions.TransferConditionsToLux(WeatherConditions.Overcast) / 1000));
+
+
+            Mock<IDataLoader> dl = new Mock<IDataLoader>();
+            dl.Setup(m => m.LoadWeatherFile(path)).Returns(data);
+
+            WeatherParser target = new WeatherParser(dl.Object);
+            PrivateObject obj = new PrivateObject(target);
+
+            List<ActivityInfo> jis = new List<ActivityInfo>();
+            List<ActivityInfo> pc = new List<ActivityInfo>();
+
+            List<WeatherInfo> retVal = (List<WeatherInfo>)obj.Invoke("ProcessOneWeatherFileAsIntervals", path, 2, new DateTime(2000, 1, 1, 9, 0, 0), new DateTime(2000, 2, 1, 13, 0, 0));
+
+            Assert.AreEqual(3, retVal.Count);
+            Assert.AreEqual(new WeatherInfo(new DateTime(2000, 1, 1, 9, 0, 0), 6.5, 100, 1.5, 10_000, 2), retVal[0]);
+            Assert.AreEqual(new WeatherInfo(new DateTime(2000, 2, 1, 11, 0, 0), 5, 0, 2, 60_000, 2), retVal[1]);
+            Assert.AreEqual(new WeatherInfo(new DateTime(2000, 2, 1, 13, 0, 0), 10, 33, 2, 10_000, 2), retVal[2]);
+        }
+
+        [TestMethod]
+        public void ParseWeatherHourNone()
+        {
+            string path = "";
+            List<WeatherInstance> data = new List<WeatherInstance>();
+            
+            // day 1
+            data.Add(new WeatherInstance(new DateTime(2000, 1, 1, 8, 0, 0), 5, 0, 1, ValueToConditions.TransferConditionsToLux(WeatherConditions.Dark) / 1000));
+            data.Add(new WeatherInstance(new DateTime(2000, 1, 1, 9, 0, 0), 10, 0, 1, ValueToConditions.TransferConditionsToLux(WeatherConditions.Dark) / 1000));
+
+            // day 2
+            data.Add(new WeatherInstance(new DateTime(2000, 2, 1, 16, 0, 0), 10, 2, 0, ValueToConditions.TransferConditionsToLux(WeatherConditions.Overcast) / 1000));
+            data.Add(new WeatherInstance(new DateTime(2000, 2, 1, 17, 0, 0), 15, 2, 1, ValueToConditions.TransferConditionsToLux(WeatherConditions.Overcast) / 1000));
+
+
+            Mock<IDataLoader> dl = new Mock<IDataLoader>();
+            dl.Setup(m => m.LoadWeatherFile(path)).Returns(data);
+
+            WeatherParser target = new WeatherParser(dl.Object);
+            PrivateObject obj = new PrivateObject(target);
+
+            List<ActivityInfo> jis = new List<ActivityInfo>();
+            List<ActivityInfo> pc = new List<ActivityInfo>();
+
+            List<WeatherInfo> retVal = (List<WeatherInfo>)obj.Invoke("ProcessOneWeatherFileAsIntervals", path, 2, new DateTime(2000, 1, 1, 10, 0, 0), new DateTime(2000, 2, 1, 15, 0, 0));
+
+            Assert.AreEqual(0, retVal.Count);
+        }
+        #endregion
+
+        #endregion
+
+        #region Jis parser
+
+        #region Parse days
+        [TestMethod]
+        public void ParseJisDayOne()
+        {
+            TagInfo.CreateDictionaries();
+
+            string path = "";
+            List<JisInstance> data = new List<JisInstance>();
+            data.Add(new JisInstance("MenzaKL-vydej", new DateTime(2000, 1, 1, 7, 0, 0), 2));
+            data.Add(new JisInstance("A2-Hlavni vchod", new DateTime(2000, 1, 1, 10, 0, 0), 3));
+            data.Add(new JisInstance("Menza4-kasa5", new DateTime(2000, 1, 1, 12, 0, 0), 1));
+            data.Add(new JisInstance("A1", new DateTime(2000, 1, 1, 15, 0, 0), 2));
+
+            Mock<IDataLoader> dl = new Mock<IDataLoader>();
+            dl.Setup(m => m.LoadJisFile(path)).Returns(data);
+
+            JisParser target = new JisParser(dl.Object);
+            PrivateObject obj = new PrivateObject(target);
+
+            List<ActivityInfo> retVal = (List<ActivityInfo>)obj.Invoke("ProcessOneJisFileAsDays", path, new DateTime(2000, 1, 1), new DateTime(2001, 1, 1));
+
+            Assert.AreEqual(2, retVal.Count);
+            Assert.AreEqual(new ActivityInfo("MENZA", 3, new DateTime(2000, 1, 1, 7, 0, 0), 18 - 7), retVal[0]);
+            Assert.AreEqual(new ActivityInfo("KARMA", 5, new DateTime(2000, 1, 1, 7, 0, 0), 18 - 7), retVal[1]);
+        }
+
+        [TestMethod]
+        public void ParseJisDayOneFiltering()
+        {
+            TagInfo.CreateDictionaries();
+
+            string path = "";
+            List<JisInstance> data = new List<JisInstance>();
+            data.Add(new JisInstance("MenzaKL-vydej", new DateTime(2000, 1, 1, 6, 0, 0), 2));
+            data.Add(new JisInstance("MenzaKL-vydej", new DateTime(2000, 1, 1, 7, 0, 0), 2));
+            data.Add(new JisInstance("A2-Hlavni vchod", new DateTime(2000, 1, 1, 10, 0, 0), 3));
+            data.Add(new JisInstance("Menza4-kasa5", new DateTime(2000, 1, 1, 12, 0, 0), 1));
+            data.Add(new JisInstance("A1", new DateTime(2000, 1, 1, 15, 0, 0), 2));
+            data.Add(new JisInstance("A1", new DateTime(2000, 1, 1, 17, 0, 0), 2));
+
+            Mock<IDataLoader> dl = new Mock<IDataLoader>();
+            dl.Setup(m => m.LoadJisFile(path)).Returns(data);
+
+            JisParser target = new JisParser(dl.Object);
+            PrivateObject obj = new PrivateObject(target);
+
+            List<ActivityInfo> retVal = (List<ActivityInfo>)obj.Invoke("ProcessOneJisFileAsDays", path, new DateTime(2000, 1, 1), new DateTime(2000, 1, 1, 16, 0, 0));
+
+            Assert.AreEqual(2, retVal.Count);
+            Assert.AreEqual(new ActivityInfo("MENZA", 3, new DateTime(2000, 1, 1, 7, 0, 0), 18 - 7), retVal[0]);
+            Assert.AreEqual(new ActivityInfo("KARMA", 5, new DateTime(2000, 1, 1, 7, 0, 0), 18 - 7), retVal[1]);
+        }
+
+        [TestMethod]
+        public void ParseJisDayTwo()
+        {
+            TagInfo.CreateDictionaries();
+
+            string path = "";
+            List<JisInstance> data = new List<JisInstance>();
+            data.Add(new JisInstance("MenzaKL-vydej", new DateTime(2000, 1, 1, 7, 0, 0), 2));
+            data.Add(new JisInstance("A2-Hlavni vchod", new DateTime(2000, 1, 1, 10, 0, 0), 3));
+            data.Add(new JisInstance("Menza4-kasa5", new DateTime(2000, 1, 1, 12, 0, 0), 1));
+            data.Add(new JisInstance("A1", new DateTime(2000, 1, 1, 15, 0, 0), 2));
+            
+            data.Add(new JisInstance("MenzaKL-vydej", new DateTime(2000, 2, 1, 8, 0, 0), 8));
+            data.Add(new JisInstance("Menza4-kasa5", new DateTime(2000, 2, 1, 12, 0, 0), 2));
+            data.Add(new JisInstance("A2", new DateTime(2000, 2, 1, 16, 0, 0), 1));
+
+            Mock<IDataLoader> dl = new Mock<IDataLoader>();
+            dl.Setup(m => m.LoadJisFile(path)).Returns(data);
+
+            JisParser target = new JisParser(dl.Object);
+            PrivateObject obj = new PrivateObject(target);
+
+            List<ActivityInfo> retVal = (List<ActivityInfo>)obj.Invoke("ProcessOneJisFileAsDays", path, new DateTime(2000, 1, 1), new DateTime(2000, 2, 1, 16, 0, 0));
+
+            Assert.AreEqual(4, retVal.Count);
+            Assert.AreEqual(new ActivityInfo("MENZA", 3, new DateTime(2000, 1, 1, 7, 0, 0), 18 - 7), retVal[0]);
+            Assert.AreEqual(new ActivityInfo("KARMA", 5, new DateTime(2000, 1, 1, 7, 0, 0), 18 - 7), retVal[1]);
+
+            Assert.AreEqual(new ActivityInfo("MENZA", 10, new DateTime(2000, 2, 1, 7, 0, 0), 18 - 7), retVal[2]);
+            Assert.AreEqual(new ActivityInfo("KARMA", 1, new DateTime(2000, 2, 1, 7, 0, 0), 18 - 7), retVal[3]);
+        }
+
+        [TestMethod]
+        public void ParseJisDayTwoFiltering()
+        {
+            TagInfo.CreateDictionaries();
+
+            string path = "";
+            List<JisInstance> data = new List<JisInstance>();
+            data.Add(new JisInstance("MenzaKL-vydej", new DateTime(2000, 1, 1, 6, 0, 0), 2));
+            data.Add(new JisInstance("MenzaKL-vydej", new DateTime(2000, 1, 1, 7, 0, 0), 2));
+            data.Add(new JisInstance("A2-Hlavni vchod", new DateTime(2000, 1, 1, 10, 0, 0), 3));
+            data.Add(new JisInstance("Menza4-kasa5", new DateTime(2000, 1, 1, 12, 0, 0), 1));
+            data.Add(new JisInstance("A1", new DateTime(2000, 1, 1, 15, 0, 0), 2));
+
+            data.Add(new JisInstance("MenzaKL-vydej", new DateTime(2000, 2, 1, 8, 0, 0), 8));
+            data.Add(new JisInstance("Menza4-kasa5", new DateTime(2000, 2, 1, 12, 0, 0), 2));
+            data.Add(new JisInstance("A2", new DateTime(2000, 2, 1, 16, 0, 0), 1));
+            data.Add(new JisInstance("A2", new DateTime(2000, 2, 1, 17, 0, 0), 2));
+
+            Mock<IDataLoader> dl = new Mock<IDataLoader>();
+            dl.Setup(m => m.LoadJisFile(path)).Returns(data);
+
+            JisParser target = new JisParser(dl.Object);
+            PrivateObject obj = new PrivateObject(target);
+
+            List<ActivityInfo> retVal = (List<ActivityInfo>)obj.Invoke("ProcessOneJisFileAsDays", path, new DateTime(2000, 1, 1), new DateTime(2000, 2, 1, 16, 0, 0));
+
+            Assert.AreEqual(4, retVal.Count);
+            Assert.AreEqual(new ActivityInfo("MENZA", 3, new DateTime(2000, 1, 1, 7, 0, 0), 18 - 7), retVal[0]);
+            Assert.AreEqual(new ActivityInfo("KARMA", 5, new DateTime(2000, 1, 1, 7, 0, 0), 18 - 7), retVal[1]);
+
+            Assert.AreEqual(new ActivityInfo("MENZA", 10, new DateTime(2000, 2, 1, 7, 0, 0), 18 - 7), retVal[2]);
+            Assert.AreEqual(new ActivityInfo("KARMA", 1, new DateTime(2000, 2, 1, 7, 0, 0), 18 - 7), retVal[3]);
+        }
+
+
+        [TestMethod]
+        public void ParseJisDayNone()
+        {
+            TagInfo.CreateDictionaries();
+
+            string path = "";
+            List<JisInstance> data = new List<JisInstance>();
+            data.Add(new JisInstance("MenzaKL-vydej", new DateTime(2000, 1, 1, 7, 0, 0), 2));
+            data.Add(new JisInstance("A2-Hlavni vchod", new DateTime(2000, 1, 1, 10, 0, 0), 3));
+            data.Add(new JisInstance("Menza4-kasa5", new DateTime(2000, 1, 1, 12, 0, 0), 1));
+            data.Add(new JisInstance("A1", new DateTime(2000, 1, 1, 15, 0, 0), 2));
+
+            data.Add(new JisInstance("A1", new DateTime(2000, 1, 2, 15, 0, 0), 2));
+
+            Mock<IDataLoader> dl = new Mock<IDataLoader>();
+            dl.Setup(m => m.LoadJisFile(path)).Returns(data);
+
+            JisParser target = new JisParser(dl.Object);
+            PrivateObject obj = new PrivateObject(target);
+
+            List<ActivityInfo> retVal = (List<ActivityInfo>)obj.Invoke("ProcessOneJisFileAsDays", path, new DateTime(2000, 1, 3), new DateTime(2001, 1, 1));
+
+            Assert.AreEqual(0, retVal.Count);
+        }
+        #endregion
+
+        #region Parse hours
+        [TestMethod]
+        public void ParseJisHourlyOne()
+        {
+            TagInfo.CreateDictionaries();
+
+            string path = "";
+            List<JisInstance> data = new List<JisInstance>();
+            data.Add(new JisInstance("MenzaKL-vydej", new DateTime(2000, 1, 1, 7, 0, 0), 2));
+            data.Add(new JisInstance("A2-Hlavni vchod", new DateTime(2000, 1, 1, 8, 0, 0), 3));
+            data.Add(new JisInstance("A2-Hlavni vchod", new DateTime(2000, 1, 1, 8, 15, 0), 3));
+
+            /*
+            data.Add(new JisInstance("Menza4-kasa5", new DateTime(2000, 1, 1, 12, 0, 0), 5));
+            data.Add(new JisInstance("Menza4-kasa5", new DateTime(2000, 1, 1, 12, 0, 0), 1));
+            data.Add(new JisInstance("A1", new DateTime(2000, 1, 1, 15, 0, 0), 2));
+            */
+
+            Mock<IDataLoader> dl = new Mock<IDataLoader>();
+            dl.Setup(m => m.LoadJisFile(path)).Returns(data);
+
+            JisParser target = new JisParser(dl.Object);
+            PrivateObject obj = new PrivateObject(target);
+
+            List<ActivityInfo> retVal = (List<ActivityInfo>)obj.Invoke("ProcessOneJisFileAsIntervals", path, 2, new DateTime(2000, 1, 1), new DateTime(2001, 1, 1));
+
+            Assert.AreEqual(2, retVal.Count);
+            Assert.AreEqual(new ActivityInfo("MENZA", 2, new DateTime(2000, 1, 1, 7, 0, 0), 2), retVal[0]);
+            Assert.AreEqual(new ActivityInfo("KARMA", 6, new DateTime(2000, 1, 1, 7, 0, 0), 2), retVal[1]);
+        }
+
+        [TestMethod]
+        public void ParseJisDayHourlyMultiple()
+        {
+            TagInfo.CreateDictionaries();
+
+            string path = "";
+            List<JisInstance> data = new List<JisInstance>();
+            data.Add(new JisInstance("MenzaKL-vydej", new DateTime(2000, 1, 1, 7, 0, 0), 2));
+            data.Add(new JisInstance("A2-Hlavni vchod", new DateTime(2000, 1, 1, 8, 0, 0), 3));
+            data.Add(new JisInstance("A2-Hlavni vchod", new DateTime(2000, 1, 1, 8, 15, 0), 3));
+
+            data.Add(new JisInstance("Menza4-kasa5", new DateTime(2000, 1, 1, 11, 0, 0), 5));
+            data.Add(new JisInstance("Menza4-kasa5", new DateTime(2000, 1, 1, 11, 10, 0), 1));
+            data.Add(new JisInstance("A1", new DateTime(2000, 1, 1, 11, 20, 0), 2));
+
+            Mock<IDataLoader> dl = new Mock<IDataLoader>();
+            dl.Setup(m => m.LoadJisFile(path)).Returns(data);
+
+            JisParser target = new JisParser(dl.Object);
+            PrivateObject obj = new PrivateObject(target);
+
+            List<ActivityInfo> retVal = (List<ActivityInfo>)obj.Invoke("ProcessOneJisFileAsIntervals", path, 2, new DateTime(2000, 1, 1), new DateTime(2001, 1, 1));
+
+            Assert.AreEqual(4, retVal.Count);
+            Assert.AreEqual(new ActivityInfo("MENZA", 2, new DateTime(2000, 1, 1, 7, 0, 0), 2), retVal[0]);
+            Assert.AreEqual(new ActivityInfo("KARMA", 6, new DateTime(2000, 1, 1, 7, 0, 0), 2), retVal[1]);
+            Assert.AreEqual(new ActivityInfo("MENZA", 6, new DateTime(2000, 1, 1, 11, 0, 0), 2), retVal[2]);
+            Assert.AreEqual(new ActivityInfo("KARMA", 2, new DateTime(2000, 1, 1, 11, 0, 0), 2), retVal[3]);
+        }
+
+        [TestMethod]
+        public void ParseJisHourlyNone()
+        {
+            TagInfo.CreateDictionaries();
+
+            string path = "";
+            List<JisInstance> data = new List<JisInstance>();
+            data.Add(new JisInstance("MenzaKL-vydej", new DateTime(2000, 1, 1, 3, 0, 0), 2));
+            data.Add(new JisInstance("A2-Hlavni vchod", new DateTime(2000, 1, 1, 4, 0, 0), 3));
+            data.Add(new JisInstance("A2-Hlavni vchod", new DateTime(2000, 1, 1, 5, 15, 0), 3));
+
+            data.Add(new JisInstance("Menza4-kasa5", new DateTime(2000, 1, 1, 19, 0, 0), 5));
+            data.Add(new JisInstance("Menza4-kasa5", new DateTime(2000, 1, 1, 19, 10, 0), 1));
+            data.Add(new JisInstance("A1", new DateTime(2000, 1, 1, 19, 20, 0), 2));
+
+            Mock<IDataLoader> dl = new Mock<IDataLoader>();
+            dl.Setup(m => m.LoadJisFile(path)).Returns(data);
+
+            JisParser target = new JisParser(dl.Object);
+            PrivateObject obj = new PrivateObject(target);
+
+            List<ActivityInfo> retVal = (List<ActivityInfo>)obj.Invoke("ProcessOneJisFileAsIntervals", path, 2, new DateTime(2000, 1, 1), new DateTime(2001, 1, 1));
+
+            Assert.AreEqual(0, retVal.Count);
+        }
+
+        [TestMethod]
+        public void ParseJisHourlyFiltering()
+        {
+            TagInfo.CreateDictionaries();
+
+            string path = "";
+            List<JisInstance> data = new List<JisInstance>();
+            data.Add(new JisInstance("MenzaKL-vydej", new DateTime(2000, 1, 1, 6, 0, 0), 2));
+            data.Add(new JisInstance("A2-Hlavni vchod", new DateTime(2000, 1, 1, 8, 0, 0), 3));
+            data.Add(new JisInstance("A2-Hlavni vchod", new DateTime(2000, 1, 1, 8, 15, 0), 3));
+
+            data.Add(new JisInstance("Menza4-kasa5", new DateTime(2000, 1, 1, 11, 0, 0), 5));
+            data.Add(new JisInstance("Menza4-kasa5", new DateTime(2000, 1, 1, 18, 10, 0), 1));
+            data.Add(new JisInstance("A1", new DateTime(2000, 1, 1, 19, 20, 0), 2));
+
+            Mock<IDataLoader> dl = new Mock<IDataLoader>();
+            dl.Setup(m => m.LoadJisFile(path)).Returns(data);
+
+            JisParser target = new JisParser(dl.Object);
+            PrivateObject obj = new PrivateObject(target);
+
+            List<ActivityInfo> retVal = (List<ActivityInfo>)obj.Invoke("ProcessOneJisFileAsIntervals", path, 2, new DateTime(2000, 1, 1), new DateTime(2001, 1, 1));
+
+            Assert.AreEqual(3, retVal.Count);
+            Assert.AreEqual(new ActivityInfo("KARMA", 6, new DateTime(2000, 1, 1, 7, 0, 0), 2), retVal[0]);
+            Assert.AreEqual(new ActivityInfo("MENZA", 5, new DateTime(2000, 1, 1, 11, 0, 0), 2), retVal[1]);
+            Assert.AreEqual(new ActivityInfo("MENZA", 1, new DateTime(2000, 1, 1, 17, 0, 0), 2), retVal[2]);
+        }
+
+        #endregion
+
+        #endregion
+    }
+}

Server/TestProject/TestProject.csproj

@@ -63 +63 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="TestingParser.cs" />
+    <Compile Include="ParserTests\TestingParser.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>

Server/TestProject/TestingParser.cs

@@ -1 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using System;
-using ServerApp.Parser.Parsers;
-using System.Collections.Generic;
-using ServerApp.Parser.OutputInfo;
-
-namespace TestProject
-{
-    [TestClass]
-    public class TestingParser
-    {
-        [TestMethod]
-        public void AbstactClassTest()
-        {
-            IDataParser p = new DataParser(null);
-            List<ActivityInfo> aa = p.AttendanceList;
-            List<WeatherInfo> wa = p.WeatherList;
-
-            DataParser pp = (DataParser)p;
-            List<ActivityInfo> ap = pp.AttendanceList;
-            List<WeatherInfo> wp = pp.WeatherList;
-
-            Assert.AreEqual(aa, ap);
-            Assert.AreEqual(wa, wp);
-        }
-
-        [TestMethod]
-        public void MergeListsNull()
-        {
-            DataParser target = new DataParser(null);
-            PrivateObject obj = new PrivateObject(target);
-
-            List<ActivityInfo> jis = null;
-            List<ActivityInfo> pc = null;
-
-            List<ActivityInfo> retVal = (List<ActivityInfo>)obj.Invoke("MergeAttendance", jis, pc);
-            Assert.AreEqual(0, retVal.Count);
-        }
-
-        [TestMethod]
-        public void MergeListsJisNull()
-        {
-            DataParser target = new DataParser(null);
-            PrivateObject obj = new PrivateObject(target);
-
-            List<ActivityInfo> jis = null;
-            List<ActivityInfo> pc = new List<ActivityInfo>();
-
-            List<ActivityInfo> retVal = (List<ActivityInfo>)obj.Invoke("MergeAttendance", jis, pc);
-            Assert.AreEqual(pc, retVal);
-        }
-
-        [TestMethod]
-        public void MergeListsPcNull()
-        {
-            DataParser target = new DataParser(null);
-            PrivateObject obj = new PrivateObject(target);
-
-            List<ActivityInfo> jis = new List<ActivityInfo>();
-            List<ActivityInfo> pc = null;
-
-            List<ActivityInfo> retVal = (List<ActivityInfo>)obj.Invoke("MergeAttendance", jis, pc);
-            Assert.AreEqual(jis, retVal);
-        }
-    }
-}

TextureEditing/bin/Debug/net5.0/TextureEditing.deps.json

@@ +1 @@
+{
+  "runtimeTarget": {
+    "name": ".NETCoreApp,Version=v5.0",
+    "signature": ""
+  },
+  "compilationOptions": {},
+  "targets": {
+    ".NETCoreApp,Version=v5.0": {
+      "TextureEditing/1.0.0": {
+        "dependencies": {
+          "System.Drawing.Common": "5.0.2"
+        },
+        "runtime": {
+          "TextureEditing.dll": {}
+        }
+      },
+      "Microsoft.NETCore.Platforms/5.0.0": {},
+      "Microsoft.Win32.SystemEvents/5.0.0": {
+        "dependencies": {
+          "Microsoft.NETCore.Platforms": "5.0.0"
+        },
+        "runtime": {
+          "lib/netstandard2.0/Microsoft.Win32.SystemEvents.dll": {
+            "assemblyVersion": "5.0.0.0",
+            "fileVersion": "5.0.20.51904"
+          }
+        },
+        "runtimeTargets": {
+          "runtimes/win/lib/netcoreapp3.0/Microsoft.Win32.SystemEvents.dll": {
+            "rid": "win",
+            "assetType": "runtime",
+            "assemblyVersion": "5.0.0.0",
+            "fileVersion": "5.0.20.51904"
+          }
+        }
+      },
+      "System.Drawing.Common/5.0.2": {
+        "dependencies": {
+          "Microsoft.Win32.SystemEvents": "5.0.0"
+        },
+        "runtime": {
+          "lib/netcoreapp3.0/System.Drawing.Common.dll": {
+            "assemblyVersion": "5.0.0.2",
+            "fileVersion": "5.0.421.11614"
+          }
+        },
+        "runtimeTargets": {
+          "runtimes/unix/lib/netcoreapp3.0/System.Drawing.Common.dll": {
+            "rid": "unix",
+            "assetType": "runtime",
+            "assemblyVersion": "5.0.0.2",
+            "fileVersion": "5.0.421.11614"
+          },
+          "runtimes/win/lib/netcoreapp3.0/System.Drawing.Common.dll": {
+            "rid": "win",
+            "assetType": "runtime",
+            "assemblyVersion": "5.0.0.2",
+            "fileVersion": "5.0.421.11614"
+          }
+        }
+      }
+    }
+  },
+  "libraries": {
+    "TextureEditing/1.0.0": {
+      "type": "project",
+      "serviceable": false,
+      "sha512": ""
+    },
+    "Microsoft.NETCore.Platforms/5.0.0": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-VyPlqzH2wavqquTcYpkIIAQ6WdenuKoFN0BdYBbCWsclXacSOHNQn66Gt4z5NBqEYW0FAPm5rlvki9ZiCij5xQ==",
+      "path": "microsoft.netcore.platforms/5.0.0",
+      "hashPath": "microsoft.netcore.platforms.5.0.0.nupkg.sha512"
+    },
+    "Microsoft.Win32.SystemEvents/5.0.0": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-Bh6blKG8VAKvXiLe2L+sEsn62nc1Ij34MrNxepD2OCrS5cpCwQa9MeLyhVQPQ/R4Wlzwuy6wMK8hLb11QPDRsQ==",
+      "path": "microsoft.win32.systemevents/5.0.0",
+      "hashPath": "microsoft.win32.systemevents.5.0.0.nupkg.sha512"
+    },
+    "System.Drawing.Common/5.0.2": {
+      "type": "package",
+      "serviceable": true,
+      "sha512": "sha512-rvr/M1WPf24ljpvvrVd74+NdjRUJu1bBkspkZcnzSZnmAUQWSvanlQ0k/hVHk+cHufZbZfu7vOh/vYc0q5Uu/A==",
+      "path": "system.drawing.common/5.0.2",
+      "hashPath": "system.drawing.common.5.0.2.nupkg.sha512"
+    }
+  }
+}

TextureEditing/bin/Debug/net5.0/TextureEditing.runtimeconfig.dev.json

@@ +1 @@
+{
+  "runtimeOptions": {
+    "additionalProbingPaths": [
+      "C:\\Users\\Daemon\\.dotnet\\store\\|arch|\\|tfm|",
+      "C:\\Users\\Daemon\\.nuget\\packages",
+      "D:\\Instalace\\VS\\Shared\\NuGetPackages"
+    ]
+  }
+}

TextureEditing/bin/Debug/net5.0/TextureEditing.runtimeconfig.json

@@ +1 @@
+{
+  "runtimeOptions": {
+    "tfm": "net5.0",
+    "framework": {
+      "name": "Microsoft.NETCore.App",
+      "version": "5.0.0"
+    }
+  }
+}