Revize 6d0d1410

Re #8941. Started working on enqueueing requests and processing them in a new thread. + Program.cs cleanup + Fixed Date error.

Server/ServerApp/Program.cs

@@ -42 +42 @@
 				return;
 			}
 
-            
+			// commands accepting test
 			//create a thread for commands accepting:
 			//Thread inputThread = new Thread(CommandsAcceptor.AcceptCommand);
 			//inputThread.Start();
 
 
-
+			// is this obsolete?
 			//DataParser p = new DataParser("data/");
 			//p.Parse();
 
-			#region UNCOMMENT
+
+
+			// data download test
+			//DataDownloader dd = DataDownloadAndRetrievalTest(config);
+
+			// xml building test
+			//XMLTest();
+
+
+
+			// PARSE DATA
+
+
+
+			
+			// json parser test
+			//JSONParserTest();
+
+			// model test
+			//IPredictionController controller = PredictionTest(dd);
+
+
+
+			//parse(new DateTime(2019, 10, 5), , interval = 1, wholeDay = true)
+
+
+			// connection test
+			ConnectionTest(/*controller,*/ config);
+			
+
+			Console.ReadLine();
+        }
+
+
+		private static DataDownloader DataDownloadAndRetrievalTest(Config config)
+		{
 			//test scenario -data download:
 			DataDownloader dd = new DataDownloader(config.DataRootDir, config.DataWebsite, config.DownloadedFilesNaming);
 			dd.OverwriteExisting = false;
@@ -63 +98 @@
 
 
 
-			//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);
-			//}
-
-			//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);
-			//}
-			// test - connection:
-			//ConnectionListener cl = new ConnectionListener(int.Parse(config.Port));
-			//cl.StartListening();
-			#endregion
-
-			#region XML_TEST
-			//Response response = Response.Randomize();
-			//var xml = XmlCommunication.Serialize(response);
-			//Console.WriteLine(xml);
-			//Response responseDeserialized = XmlCommunication.Deserialize(response, xml);
-
-			//Console.WriteLine("------");
-
-
-			//Request request = Request.Randomize();
-			//xml = XmlCommunication.Serialize(request);
-			//Console.WriteLine(xml);
-			//Request requestDeserialized = XmlCommunication.Deserialize(request, xml);
-			#endregion
-
-
-			//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);
-			//}
-
-			/*
-			
-			List<string> retrievedData = dd.GetData(dd.DataSubDirectories[DataType.JIS], new Date(10, 2019), new Date(12, 2020));
+			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);
+			}
+
+			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;
+		}
+
+
+		private static void XMLTest()
+		{
+			Response response = Response.Randomize();
+			var xml = XmlCommunication.Serialize(response);
+			Console.WriteLine(xml);
+			Response responseDeserialized = XmlCommunication.Deserialize(response, xml);
 
-            // PARSE DATA
+			Console.WriteLine("------");
 
 
+			Request request = Request.Randomize();
+			xml = XmlCommunication.Serialize(request);
+			Console.WriteLine(xml);
+			Request requestDeserialized = XmlCommunication.Deserialize(request, xml);
+		}
+
 
-            JsonParser jsonP = new JsonParser(null);
+		private static void JSONParserTest()
+		{
+			JsonParser jsonP = new JsonParser(null);
 			jsonP.ParsePrediction();
 
 			var res = jsonP.GetPredictionForTime(jsonP.Predictions[5].startTime, jsonP.Predictions[20].startTime);
@@ -142 +155 @@
 			Console.WriteLine("end " + jsonP.Predictions[20].startTime);
 			foreach (WeatherInfo w in res)
 				Console.WriteLine(w.ToString());
+		}
 
-
+		private static IPredictionController PredictionTest(DataDownloader dd)
+		{
 			// TODO nastavit čas
 			IDataParser p = new DataParser(dd);
-            IPredictionController predictionController = new PredictionController(p);
-            predictionController.Train();
-            //var results = predictionController.Predict()
-			
-
-			//parse(new DateTime(2019, 10, 5), , interval = 1, wholeDay = true)
+			IPredictionController predictionController = new PredictionController(p);
+			predictionController.Train();
+			//var results = predictionController.Predict()
 
+			return predictionController;
+		}
 
-			// test - connection:
-			//ConnectionListener cl = new ConnectionListener(int.Parse(args[0])/*8000*//*int.Parse(config.Port)*/);
-			//cl.StartListening();
+		private static void ConnectionTest(/*IPredictionController predictionController,*/ Config config)
+		{
+			ConnectionListener cl = new ConnectionListener(int.Parse(config.Port));
+			cl.StartListening();
 
-			Console.ReadLine();
-        }
+			//HttpRequestHandler hrh = new HttpRequestHandler(int.Parse(config.Port));
+			//hrh.ListenAsynchronously();
+		}
 
 
-        private static Config FillConfigInfo(string[] args)
+		private static Config FillConfigInfo(string[] args)
 		{
 
 			Config extractedConfigInfo = new Config();