Revize 98b568bc

re #8612 Weather parser in hourly intervals

Server/ServerApp/Parser/Parsers/DataParser.cs

@@ -1 @@
-using ServerApp.Parser.OutputInfo;
+using ServerApp.Parser.InputData;
+using ServerApp.Parser.OutputInfo;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
@@ -10 +11 @@
     /// Class parsing data files into instances of ActivityInfo and WeatherInfo divided by given time interval
     /// Data parsed from 7am (included) to 18pm (included)
     /// </summary>
+    /// <author>Alex Konig</author>
     class DataParser
     {
         /// <summary> Path to data folder </summary>
@@ -31 +33 @@
         /// <summary>
         /// Constructor
         /// </summary>
-        public DataParser()
+        public DataParser(string path)
         {
             TagInfo.CreateDictionaries();
 
             // TODO ask for data folder?
-            path = "data/";
+            this.path = path;
+            DataLoader loader = new CsvDataLoader();
 
-            weatherParser = new WeatherParser();
-            jisParser = new JisParser();
-            loginParser = new LogInParser();
+            weatherParser = new WeatherParser(loader);
+            jisParser = new JisParser(loader);
+            loginParser = new LogInParser(loader);
         }
 
         /// <summary>
@@ -58 +61 @@
             string pathJis = path + "jis";
             string pathLogIn = path + "login";
 
-            weatherList = weatherParser.ParseWeatherData(pathWeather, wholeDay, interval);
+            weatherList = weatherParser.ParseWeatherData(pathWeather, false, 2); // wholeDay, interval);
             jisList = jisParser.ParseJisData(pathJis, false, 2); // wholeDay, interval);
             loginList = loginParser.ParseLogInData(pathLogIn, false, 2); // wholeDay, interval);