Revize f7eb37b3

Refactor + logging config modification

Server/ServerApp/Program.cs

@@ -1 @@
-using log4net.Config;
+using log4net;
+using log4net.Config;
 using ServerApp.Connection;
 using ServerApp.Connection.XMLProtocolHandler;
 using ServerApp.DataDownload;
@@ -27 +28 @@
 
     public class Program
     {
+		// logger class instance
+		private static readonly ILog logger = LogManager.GetLogger(typeof(Program));
 
-        static void Main(string[] args)
+		static void Main(string[] args)
         {
+			Console.WriteLine("Server start.");
+
             // setup logging service
             XmlConfigurator.Configure();
 
@@ -41 +46 @@
 				Console.ReadLine();
 				return;
 			}
+			Console.WriteLine("Config parsing successful.");
+
+			//logger.Debug("ahoj");
+			//logger.Warn("ahoj2");
+			//Console.ReadLine();
 
-			// data download test
-			DataDownloader dd = DataDownloadAndRetrievalTest(config);
+			// data download init
+			Console.WriteLine("Downloading open data...");
+			DataDownloader dd = DataDownloaderInit(config);
+			Console.WriteLine("Data downloaded and saved.");
 
 			//WeatherAsStringTest(dd);
 			//Console.ReadLine();
@@ -51 +63 @@
 			// xml building test
 			//XMLTest();
 
-			// PARSE DATA
-			//DataParser parser = new DataParser(dd);
-			//parser.Parse(new DateTime())
 
 			// json parser test
 			//JSONParserTest();
 
-			// model test
-			IPredictionController controller = PredictionTest(dd);
+			// model init
+			Console.WriteLine("Training the predictor...");
+			IPredictionController controller = PredictionControllerInit(dd);
+			Console.WriteLine("Predictor training finished.");
 
-			//parse(new DateTime(2019, 10, 5), , interval = 1, wholeDay = true)
 
 			// commands accepting test
 			// create a thread for commands accepting:
@@ -70 +80 @@
 			inputThread.Start();
 
 
-			// connection test
-			ConnectionTest(controller, config);
+			// connection init
+			ConnectionInit(controller, config);
 
-			//Console.ReadLine();
         }
 
 
-		private static DataDownloader DataDownloadAndRetrievalTest(Config config)
+		private static DataDownloader DataDownloaderInit(Config config)
 		{
 			//test scenario -data download:
 			DataDownloader dd = new DataDownloader(config.DataRootDir, config.DataWebsite, config.DownloadedFilesNaming, config.WeatherSite);
@@ -91 +100 @@
 
 
 
-			Console.WriteLine("Saved files: ");
-			foreach (string s in savedFiles)
-			{
-				Console.WriteLine(s);
-			}
+			//Console.WriteLine("Saved files: ");
+			//foreach (string s in savedFiles)
+			//{
+			//	Console.WriteLine(s);
+			//}
 
-			Console.WriteLine("subdirectories: ");
-			foreach (KeyValuePair<DataType, string> kvp in dd.DataSubDirectories)
-			{
-				Console.WriteLine("Key = {0}, Value = {1}", kvp.Key, kvp.Value);
-			}
+			//Console.WriteLine("subdirectories: ");
+			//foreach (KeyValuePair<DataType, string> kvp in dd.DataSubDirectories)
+			//{
+			//	Console.WriteLine("Key = {0}, Value = {1}", kvp.Key, kvp.Value);
+			//}
 
-			List<string> retrievedData = dd.GetData(dd.DataSubDirectories[DataType.JIS], new DataDownload.Date(10, 2019), new DataDownload.Date(12, 2020));
-			Console.WriteLine("Retrieved data: ");
-			foreach (string s in retrievedData)
-			{
-				Console.WriteLine(s);
-			}
-			Console.WriteLine("all from directory:");
-			retrievedData = dd.GetData(dd.DataSubDirectories[DataType.JIS], null, null);
-			foreach (string s in retrievedData)
-			{
-				Console.WriteLine(s);
-			}
+			//List<string> retrievedData = dd.GetData(dd.DataSubDirectories[DataType.JIS], new DataDownload.Date(10, 2019), new DataDownload.Date(12, 2020));
+			//Console.WriteLine("Retrieved data: ");
+			//foreach (string s in retrievedData)
+			//{
+			//	Console.WriteLine(s);
+			//}
+			//Console.WriteLine("all from directory:");
+			//retrievedData = dd.GetData(dd.DataSubDirectories[DataType.JIS], null, null);
+			//foreach (string s in retrievedData)
+			//{
+			//	Console.WriteLine(s);
+			//}
 
 
 			return dd;
@@ -166 +175 @@
 			Console.WriteLine(dd.DownloadWeatherPrediction());
 		}
 
-		private static IPredictionController PredictionTest(DataDownloader dd)
+		private static IPredictionController PredictionControllerInit(DataDownloader dd)
 		{
-			// TODO nastavit čas
 			IDataParser p = new DataParser(dd);
             // FIXME pass the right references to the JsonParser constructor
             IJsonParser jsonP = new JsonParser(dd, new CsvDataLoader());
             IPredictionController predictionController = new PredictionController(jsonP, p);
             predictionController.Train();
-            //var results = predictionController.Predict()
 			
 
 			return predictionController;
 		}
 
-		private static void ConnectionTest(IPredictionController predictionController, Config config)
+		private static void ConnectionInit(IPredictionController predictionController, Config config)
 		{
 			ConnectionListenerAsync cl = new ConnectionListenerAsync(int.Parse(config.Port), predictionController);
 			cl.StartListening();
@@ -195 +202 @@
 
 			Config extractedConfigInfo = new Config();
 
-			Console.WriteLine(Directory.GetCurrentDirectory());
 			Console.WriteLine("Parsing configuration file...");
 			
 			if (args.Length != 1)