Revize 0d31f7e0

Re #8953 tests

Server/Directory.Build.targets

@@ +1 @@
+<Project>
+  <Target Name="AddInternalsVisibleTo" BeforeTargets="BeforeCompile">
+    <!-- Add default suffix if there is no InternalsVisibleTo or InternalsVisibleToSuffix defined -->
+    <ItemGroup Condition="@(InternalsVisibleToSuffix->Count()) == 0 AND @(InternalsVisibleTo->Count()) == 0">
+      <InternalsVisibleToSuffix Include="Tests" />
+      <InternalsVisibleToSuffix Include="UnitTests" />
+      <InternalsVisibleToSuffix Include="FunctionalTests" />
+    </ItemGroup>
+
+    <!-- Handle InternalsVisibleTo -->
+    <ItemGroup Condition="'@(InternalsVisibleTo->Count())' &gt; 0">
+      <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
+        <_Parameter1>%(InternalsVisibleTo.Identity)</_Parameter1>
+      </AssemblyAttribute>
+    </ItemGroup>
+
+    <!-- Handle InternalsVisibleToSuffix -->
+    <ItemGroup Condition="@(InternalsVisibleToSuffix->Count()) &gt; 0">
+      <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
+        <_Parameter1>$(AssemblyName)%(InternalsVisibleToSuffix.Identity)</_Parameter1>
+      </AssemblyAttribute>
+    </ItemGroup>
+  </Target>
+</Project>

Server/ServerApp/App.config

@@ +1 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+    <configSections>
+        <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net" />
+    </configSections>
+    <log4net>
+        <appender name="LogFileAppender" type="log4net.Appender.RollingFileAppender">
+            <param name="File" value="server.log"/>
+            <lockingModel type="log4net.Appender.FileAppender+MinimalLock" />
+            <appendToFile value="true" />
+            <rollingStyle value="Size" />
+            <maxSizeRollBackups value="2" />
+            <maximumFileSize value="5MB" />
+            <staticLogFileName value="true" />
+            <threshold>DEBUG</threshold>
+            <layout type="log4net.Layout.PatternLayout">
+                <param name="ConversionPattern" value="%d [%t] %-5p %c %m%n"/>
+            </layout>
+        </appender>
+        <appender name="ConsoleAppender" type="log4net.Appender.ConsoleAppender">
+            <layout type="log4net.Layout.PatternLayout">
+                <param name="ConversionPattern" value="%d [%t] %-5p %c %m%n"/>
+            </layout>
+        </appender>
+        <root>
+            <level value="ALL" />
+            <appender-ref ref="LogFileAppender" />
+            <appender-ref ref="ConsoleAppender" />
+        </root>
+    </log4net>
+</configuration>

Server/ServerApp/Predictor/ModelInput.cs

@@ -47 +47 @@
         /// </summary>
         [ColumnName("Rain"), LoadColumn(4)]
         public float Rain { get; set; }
+
+        public override string ToString()
+        {
+            return $"ModelInput: {Time}; {Label}; {Temp}, {Hour}, {Wind}, {Rain}";
+        }
     }
 }

Server/ServerApp/Predictor/NaiveBayesClassifier.cs

@@ -5 +5 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
+using log4net;
 using Microsoft.ML;
 
 namespace ServerApp.Predictor
@@ -14 +16 @@
     /// </summary>
     class NaiveBayesClassifier : IPredictor
     {
+        private static readonly ILog _log = LogManager.GetLogger(typeof(NaiveBayesClassifier));
+
         /// <summary>
         /// Context of the ML.NET framework.
         /// </summary>
@@ -49 +53 @@
                 .Append(_mlContext.Transforms.Conversion.MapKeyToValue(nameof(ModelOutput.PredictedLabel)));
 
             var cvResults = _mlContext.MulticlassClassification.CrossValidate(this._trainingDataView, pipeline);
-            foreach (var result in cvResults)
-            {
-                var testMetrics = result.Metrics;
-                Console.WriteLine($"*************************************************************************************************************");
-                Console.WriteLine($"*       Metrics for Multi-class Classification model - Model #{result.Fold}    ");
-                Console.WriteLine($"*------------------------------------------------------------------------------------------------------------");
-                Console.WriteLine($"*       MicroAccuracy:    {testMetrics.MicroAccuracy:0.###}");
-                Console.WriteLine($"*       MacroAccuracy:    {testMetrics.MacroAccuracy:0.###}");
-                Console.WriteLine($"*       LogLoss:          {testMetrics.LogLoss:#.###}");
-                Console.WriteLine($"*       LogLossReduction: {testMetrics.LogLossReduction:#.###}");
-                Console.WriteLine($"*       Confusion Matrix: {testMetrics.ConfusionMatrix.GetFormattedConfusionTable()}");
-                Console.WriteLine($"*************************************************************************************************************");
-            }
+            _log.Debug("Cross-validated the trained model");
             this._trainedModel = cvResults.OrderByDescending(fold => fold.Metrics.MicroAccuracy).Select(fold => fold.Model).First();
-            Console.WriteLine($"Selected the model #{cvResults.OrderByDescending(fold => fold.Metrics.MicroAccuracy).Select(fold => fold.Fold).First()} as the best.");
+            _log.Info($"Selected the model #{cvResults.OrderByDescending(fold => fold.Metrics.MicroAccuracy).Select(fold => fold.Fold).First()} as the best.");
             this._predictionEngine = _mlContext.Model.CreatePredictionEngine<ModelInput, ModelOutput>(this._trainedModel);
 
         }
 
         public string Predict(ModelInput input)
         {
+            _log.Debug($"Predicting for input: {input}");
             return this._predictionEngine.Predict(input).PredictedLabel;
         }
 

Server/ServerApp/Predictor/PredictionController.cs

@@ -9 +9 @@
 using Newtonsoft.Json;
 using ServerApp.WeatherPredictionParser;
 using ServerApp.Parser.OutputInfo;
+using System.Reflection;
+using log4net;
 
 namespace ServerApp.Predictor
 {
@@ -17 +19 @@
     /// </summary>
     public class PredictionController : IPredictionController
     {
+        private static readonly ILog _log = LogManager.GetLogger(typeof(PredictionController));
+
         /// <summary>
         /// Configuration of the <c>Predictor</c>
         /// </summary>
@@ -45 +49 @@
         /// <param name="dataParser">A data parser used to get training data.</param>
         public PredictionController(IJsonParser weatherService, IDataParser dataParser, string pathToConfig = null)
         {
+            _log.Info("Constructing a new PredictionController instance.");
             this.weatherService = weatherService;
             // load config or get the default one
             if (pathToConfig is null)
@@ -55 +60 @@
             {
                 string json = System.IO.File.ReadAllText(pathToConfig);
                 this.Configuration = JsonConvert.DeserializeObject<PredictorConfiguration>(json);
-            } catch (System.IO.IOException e)
+            }
+            catch (System.IO.IOException e)
             {
                 Console.WriteLine("Warning: could not find a configuration file, creating a new one:");
                 Console.WriteLine(e.Message.PadLeft(4));
@@ -91 +97 @@
 
         public Response Predict(Request request)
         {
+            _log.Info($"Received a prediction request: endDate={request.useEndDate}, weather={request.useWeather}");
             DateTime start = new DateTime(year: request.start.year, month: request.start.month, day: request.start.day, hour: request.start.hour, minute: 0, second: 0);
             List<Prediction> predictions = new List<Prediction>();
             if (request.useEndDate)
@@ -99 +106 @@
                 DateTime current = start;
                 while (current < end)
                 {
+                    _log.Debug($"Predicting for date {current.Date.ToShortDateString()}");
                     while (current.Hour < Date.MAX_HOUR)
                     {
+                        _log.Debug($"Predicting for time {current.TimeOfDay.ToString()}");
                         var prediction = PredictSingle(request, current);
                         predictions.Add(prediction);
                         current = current.AddHours(this.Configuration.TimeResolution);
                     }
                     current = current.AddHours(23 - current.Hour + Date.MIN_HOUR);
                 }
-            } else
+            }
+            else
             {
-                if (request.useWeather)
-                {
-                    predictions.Add(PredictSingle(request, start));
-                }
+                _log.Debug("Predicting for single DateTime.");
+                predictions.Add(PredictSingle(request, start));
             }
             var response = new Response();
             response.hoursPerSegment = Configuration.TimeResolution;
             response.predicitons = predictions.ToArray();
+            _log.Debug($"Created a response.");
             return response;
         }
 
@@ -128 +137 @@
             {
                 if (request.useWeather)
                 {
+                    _log.Debug("Predicting for requested weather.");
                     predictedLabels[i] = this.Predictors[i].Predict(new ModelInput
                     {
                         Rain = (float)request.rain,
@@ -139 +149 @@
                 }
                 else
                 {
-                    List<WeatherInfo> weatherInfos = weatherService.GetPredictionForTime(from: current, to: current.AddHours(this.Configuration.TimeResolution));
+                    _log.Debug("Retrieving weather info from the weather service.");
+                    weatherService.ParsePrediction();
+                    WeatherInfo weatherInfo = weatherService.Current;
                     predictedLabels[i] = this.Predictors[i].Predict(new ModelInput
                     {
-                        Rain = weatherInfos[0].rain,
-                        Temp = (float)weatherInfos[0].temp,
-                        Wind = (float)weatherInfos[0].wind,
+                        Rain = weatherInfo.rain,
+                        Temp = (float)weatherInfo.temp,
+                        Wind = (float)weatherInfo.wind,
                         Hour = current.Hour,
                         Time = current
                     });
@@ -164 +176 @@
                 hour = current.Hour
             };
             prediction.predictions = predictedValues;
+            _log.Debug($"Created prediction for DateTime: {prediction.dateTime}");
             return prediction;
         }
 

Server/ServerApp/Program.cs

@@ -1 @@
-using ServerApp.Connection;
+using log4net.Config;
+using ServerApp.Connection;
 using ServerApp.Connection.XMLProtocolHandler;
 using ServerApp.DataDownload;
 using ServerApp.Parser.InputData;
@@ -33 +34 @@
 
         static void Main(string[] args)
         {
-
-			// SETUP FOLDERS
-			Config config = FillConfigInfo(args);
+            XmlConfigurator.Configure();
+            // SETUP FOLDERS
+            Config config = FillConfigInfo(args);
 			if (config == null)
 			{
 				Console.ReadLine();
@@ -180 +181 @@
 			// TODO nastavit čas
 			IDataParser p = new DataParser(dd);
             // FIXME pass the right references to the JsonParser constructor
-            IJsonParser jsonP = new JsonParser(dd, null);
+            IJsonParser jsonP = new JsonParser(dd, new CsvDataLoader());
             IPredictionController predictionController = new PredictionController(jsonP, p);
             predictionController.Train();
             //var results = predictionController.Predict()

Server/ServerApp/Properties/launchSettings.json

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

Server/ServerApp/ServerApp.csproj

@@ -8 +8 @@
     </PropertyGroup>
 
     <ItemGroup>
+        <PackageReference Include="log4net" Version="2.0.12" />
         <PackageReference Include="Microsoft.ML" Version="1.5.5" />
     </ItemGroup>
 
@@ -26 +27 @@
         </EmbeddedResource>
     </ItemGroup>
 
-    <ItemGroup>
+    <!--<ItemGroup>
         <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
             <_Parameter1>ServerAppUnitTests</_Parameter1>
-            <!-- We use the value of AssemblyName to declare the value of the attribute -->
+            --><!-- We use the value of AssemblyName to declare the value of the attribute --><!--
         </AssemblyAttribute>
-    </ItemGroup>
+    </ItemGroup>-->
 
 </Project>

Server/ServerAppFunctionalTests/Predictor/PredictionControllerTests.cs

@@ +1 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using ServerApp.Predictor;
+//
+// Author: Roman Kalivoda
+//
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using ServerApp.WeatherPredictionParser;
+using ServerApp.Parser.Parsers;
+using ServerApp.Parser.InputData;
+using ServerApp.Connection.XMLProtocolHandler;
+using ServerApp.DataDownload;
+
+namespace ServerApp.Predictor.Tests
+{
+    [TestClass()]
+    public class PredictionControllerTests
+    {
+        [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");
+            PredictionController 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();
+
+            Request request = new Request()
+            {
+                useEndDate = false,
+                useWeather = false,
+                start = new Connection.XMLProtocolHandler.Date()
+                {
+                    day = DateTime.Now.Day,
+                    month = DateTime.Now.Month,
+                    year = DateTime.Now.Year,
+                    hour = 10
+                }
+            };
+            Response actual = instance.Predict(request);
+            CollectionAssert.AllItemsAreInstancesOfType(actual.predicitons, typeof(Prediction));
+            Assert.AreEqual(1, actual.predicitons.Length);
+        }
+    }
+}

Server/ServerAppUnitTests/Predictor/NaiveBayesClassifierTests.cs

@@ +1 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using ServerApp.Predictor;
+//
+// Author: Roman Kalivoda
+//
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Text.RegularExpressions;
+
+namespace ServerApp.Predictor.Tests
+{
+    [TestClass()]
+    public class NaiveBayesClassifierTests
+    {
+        static IPredictor predictor;
+
+        static readonly List<ModelInput> trainInput = new()
+        {
+                new ModelInput
+                {
+                    Label = "10%",
+                    Temp = 12,
+                    Hour = 7,
+                    Rain = 10,
+                    Time = DateTime.Now,
+                    Wind = 10
+                },
+                new ModelInput
+                {
+                    Label = "100%",
+                    Temp = 32,
+                    Hour = 7,
+                    Rain = 0,
+                    Time = DateTime.Now,
+                    Wind = 70
+                },
+                new ModelInput
+                {
+                    Label = "90%",
+                    Temp = 32,
+                    Hour = 15,
+                    Rain = 20,
+                    Time = DateTime.Now,
+                    Wind = 50
+                },
+                new ModelInput
+                {
+                    Label = "70%",
+                    Temp = 32,
+                    Hour = 18,
+                    Rain = 0,
+                    Time = DateTime.Now,
+                    Wind = 70
+                },
+                new ModelInput
+                {
+                    Label = "30%",
+                    Temp = 6,
+                    Hour = 10,
+                    Rain = 70,
+                    Time = DateTime.Now,
+                    Wind = 30
+                }
+            };
+
+        [ClassInitialize()]
+        public static void SetUpClass(TestContext context)
+        {
+            predictor = new NaiveBayesClassifier();
+            predictor.Fit(trainInput);
+        }
+
+        [TestMethod()]
+        public void PredictTest()
+        {
+            string actual = predictor.Predict(new ModelInput
+            {
+                Temp = 19,
+                Hour = 17,
+                Rain = 20,
+                Time = DateTime.Now,
+                Wind = 7
+            });
+            StringAssert.Matches(actual, new Regex(@"\d0%"));
+        }
+    }
+}

Server/ServerAppUnitTests/Predictor/PredictionControllerTests.cs

@@ -1 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using ServerApp.Predictor;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ServerApp.Predictor.Tests
-{
-    [TestClass()]
-    public class PredictionControllerTests
-    {
-        [TestMethod()]
-        public void PredictionControllerTest()
-        {
-            throw new NotImplementedException();
-        }
-
-        [TestMethod()]
-        public void GetPredictorsTest()
-        {
-            throw new NotImplementedException();
-        }
-
-        [TestMethod()]
-        public void LoadTest()
-        {
-            throw new NotImplementedException();
-        }
-
-        [TestMethod()]
-        public void PredictTest()
-        {
-            throw new NotImplementedException();
-        }
-
-        [TestMethod()]
-        public void TrainTest()
-        {
-            throw new NotImplementedException();
-        }
-    }
-}