Revize 9a529f10

Re #9063 Refactoring, fixing bugs

Server/ServerApp/Connection/ConnectionListener.cs

@@ -46 +46 @@
             MethodInfo getEPListener = hepmType.GetMethod("GetEPListener", BindingFlags.Static | BindingFlags.NonPublic);
             FieldInfo heplCert = heplType.GetField("_cert", BindingFlags.NonPublic | BindingFlags.Instance);
             object epl = getEPListener.Invoke(null, new object[] { "*", PORT, listener, true });
+            // FIXME replace the magic string below with value loaded from config file
             X509Certificate cert = new X509Certificate2("cert.p12", "changeit");
             heplCert.SetValue(epl, cert);
 

Server/ServerApp/Predictor/PredictionController.cs

@@ -100 +100 @@
                 di.Create();
             }
             FileInfo[] files = di.GetFiles();
-            if (Array.FindAll(files, f => Regex.IsMatch(f.Name, @"[-]?\d+_\d+.zip")).GroupBy(f => f.Name.Split("_.".ToCharArray())[0]).OrderBy(f => DateTime.FromBinary(Convert.ToInt64(f.Key))).Count() == Configuration.PredictorCount)
+            var orderedEnumerable = Array.FindAll(files, f => Regex.IsMatch(f.Name, @"[-]?\d+_\d+.zip")).GroupBy(f => f.Name.Split("_.".ToCharArray())[0]).OrderBy(f => DateTime.FromBinary(Convert.ToInt64(f.Key)));
+            if (orderedEnumerable.Where(g => g.Count() == Configuration.PredictorCount).Any())
             {
                 _log.Info("Found existing predictors, loading the newest.");
-                var predictorID = Array.FindAll(files, f => Regex.IsMatch(f.Name, @"[-]?\d+_\d+.zip")).GroupBy(f => f.Name.Split("_.".ToCharArray())[0]).OrderBy(f => DateTime.FromBinary(Convert.ToInt64(f.Key))).Last().Select(f => f.Name.Split("_".ToCharArray())[0]).First();
+                var predictorID = orderedEnumerable.Last().Select(f => f.Name.Split("_".ToCharArray())[0]).First();
                 this.Load(predictorID);
             }
             else
@@ -192 +193 @@
                 return 2;
             }
             FileInfo[] files = di.GetFiles();
-            if (Array.FindAll(files, f => Regex.IsMatch(f.Name, @"[-]?\d+_\d+.zip")).GroupBy(f => f.Name.Split("_.".ToCharArray())[0]).OrderBy(f => DateTime.FromBinary(Convert.ToInt64(f.Key))).Count() == Configuration.PredictorCount)
+            var orderedEnumerable = Array.FindAll(files, f => Regex.IsMatch(f.Name, @"[-]?\d+_\d+.zip")).GroupBy(f => f.Name.Split("_.".ToCharArray())[0]).OrderBy(f => DateTime.FromBinary(Convert.ToInt64(f.Key))).Where(f => ! f.Key.Equals(this.PredictorID));
+            if (orderedEnumerable.Where(g => g.Count() == Configuration.PredictorCount).Any())
             {
-                string RollbackedPredictorID = Array.FindAll(files, f => Regex.IsMatch(f.Name, @"[-]?\d+_\d+.zip")).GroupBy(f => f.Name.Split("_.".ToCharArray())[0]).OrderBy(f => DateTime.FromBinary(Convert.ToInt64(f.Key))).Last().Select(f => f.Name.Split("_".ToCharArray())[0]).First();
+                string RollbackedPredictorID = orderedEnumerable.Last().Select(f => f.Name.Split("_".ToCharArray())[0]).First();
                 this.Delete(this.PredictorID);
                 return this.Load(RollbackedPredictorID);
             } else
@@ -229 +231 @@
             {
                 DateTime end = new DateTime(year: request.end.year, month: request.end.month, day: request.end.day, hour: request.end.hour, minute: 0, second: 0);
                 DateTime current = start;
-                while (current < end)
+                while (current <= end)
                 {
                     _log.Debug($"Predicting for date {current.Date.ToShortDateString()}");
-                    while (current.Hour < Date.MAX_HOUR)
+                    while (current.Hour <= Date.MAX_HOUR)
                     {
+                        if (current.Date == end.Date && current.Hour > end.Hour)
+                        {
+                            break;  // break if the end date was reached and hour is after the end time.
+                        }
                         _log.Debug($"Predicting for time {current.TimeOfDay.ToString()}");
                         var prediction = PredictSingle(request, current);
                         predictions.Add(prediction);

Server/ServerApp/Properties/launchSettings.json

@@ -2 +2 @@
   "profiles": {
     "ServerApp": {
       "commandName": "Project",
-      "commandLineArgs": ".\\server_config"
+      "commandLineArgs": "C:\\Users\\kalivoda\\University\\KIV-ASWI\\aswi2021tri-musketyri\\Server\\ServerApp\\server_config"
     }
   }
 }

Server/ServerAppFunctionalTests/Predictor/PredictionControllerTests.cs

@@ -21 +21 @@
     [TestClass()]
     public class PredictionControllerTests
     {
+        static PredictionController instance;
+
         [AssemblyInitialize()]
         public static void ClassInit(TestContext context)
         {
             // setup logging service
             XmlConfigurator.Configure();
-        }
-
-        [TestMethod()]
-        public void PredictSingleTimeWeatherTest()
-        {
             System.IO.Directory.CreateDirectory(@".\data");
             DataDownloader dd = new DataDownloader(@".\data\dd\", "http://openstore.zcu.cz/", "OD_ZCU_{type}_{month}_{year}_{format}.zip", "http://wttr.in/Plzen,czechia?format=j1");
-            PredictionController instance = new PredictionController(new JsonParser(dd, new CsvDataLoader()), new DataParser(dd));
+            instance = new PredictionController(new JsonParser(dd, new CsvDataLoader()), new DataParser(dd));
 
             dd.DownloadData(DataType.JIS, DataFormat.CSV, new DataDownload.Date(1, 2019), new DataDownload.Date(12, 2020));
             dd.DownloadData(DataType.STROJE, DataFormat.CSV, new DataDownload.Date(1, 2017), new DataDownload.Date(12, 2020));
             dd.DownloadData(DataType.POCASI, DataFormat.CSV, new DataDownload.Date(1, 2017), new DataDownload.Date(12, 2020));
             instance.Train();
+        }
 
+        [TestMethod()]
+        public void PredictSingleTimeWeatherTest()
+        {
             Request request = new Request()
             {
                 useEndDate = false,
@@ -56 +57 @@
             CollectionAssert.AllItemsAreInstancesOfType(actual.predicitons, typeof(Prediction));
             Assert.AreEqual(1, actual.predicitons.Length);
         }
+
+        [TestMethod()]
+        public void PredictStartEndWithinSingleDayTest()
+        {
+            Request request = new Request
+            {
+                useWeather = false,
+                temperature = -0,
+                wind = -0,
+                rain = -0,
+                weather = WeatherCondition.Sunny,
+                useEndDate = true,
+                start = new Connection.XMLProtocolHandler.Date
+                {
+                    day = 11,
+                    month = 6,
+                    year = 2021,
+                    hour = 7
+                },
+                end = new Connection.XMLProtocolHandler.Date
+                {
+                    day = 11,
+                    month = 6,
+                    year = 2021,
+                    hour = 12
+                }
+            };
+            Response actual = instance.Predict(request);
+            Assert.IsTrue(Math.Abs(actual.predicitons[0].dateTime.hour - request.start.hour) <= instance.Configuration.TimeResolution);
+            Assert.IsTrue(Math.Abs(actual.predicitons[actual.predicitons.Length - 1].dateTime.hour - request.end.hour) <= instance.Configuration.TimeResolution);
+        }
+
+        [TestMethod()]
+        public void PredictStartEndEqualTest()
+        {
+            Request request = new Request
+            {
+                useWeather = false,
+                temperature = -0,
+                wind = -0,
+                rain = -0,
+                weather = WeatherCondition.Sunny,
+                useEndDate = true,
+                start = new Connection.XMLProtocolHandler.Date
+                {
+                    day = 11,
+                    month = 6,
+                    year = 2021,
+                    hour = 7
+                },
+                end = new Connection.XMLProtocolHandler.Date
+                {
+                    day = 11,
+                    month = 6,
+                    year = 2021,
+                    hour = 7
+                }
+            };
+            Response actual = instance.Predict(request);
+            Assert.IsTrue(actual.predicitons.Length == 1);
+        }
+
+        [TestMethod()]
+        public void RollbackTest()
+        {
+            instance.Train();
+            int actual = instance.Rollback();
+            Assert.AreEqual(0, actual);
+        }
     }
 }

Server/ServerAppUnitTests/Predictor/PredictionControllerTests.cs

@@ +1 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Moq;
+using ServerApp.Connection.XMLProtocolHandler;
+using ServerApp.Parser.Parsers;
+using ServerApp.Predictor;
+using ServerApp.WeatherPredictionParser;
+//
+// Author: Roman Kalivoda
+//
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ServerApp.Predictor.Tests
+{
+    [TestClass()]
+    public class PredictionControllerTests
+    {
+        
+    }
+}