Revize a53b1de8

re #8933 Testing DataParser, JisParser and WeatherParser

Server/ServerApp/Parser/Parsers/WeatherParser.cs

@@ -15 +15 @@
     /// Data parsed from 7am (included) to 18pm (included)
     /// </summary>
     /// <author>A. Konig</author>
-    class WeatherParser
+    public class WeatherParser
     {
 
         /// <summary> Datafile loader  </summary>
@@ -44 +44 @@
         {
             List<WeatherInfo> list = new List<WeatherInfo>();
 
-            if (weatherFiles == null || startTime == null || endTime == null || interval <= 0)
+            if (weatherFiles == null || interval <= 0)
                 return list;
 
             // get all files in folder
@@ -80 +80 @@
         {
             List<WeatherInfo> weatherInfo = new List<WeatherInfo>();
 
-            if (!File.Exists(path))
-                return weatherInfo;
-
             List<WeatherInstance> list = loader.LoadWeatherFile(path);
+            if (list == null)
+                return weatherInfo;
 
             // array with data [temp, rain, wind, lum]
             double[] recordedAmount = new double[4];
@@ -116 +115 @@
                 }
 
                 // if not in allowed time window -> discard
-                if (list[i].dateTime < startTime|| list[i].dateTime > endTime)
+                if (list[i].dateTime < startTime || list[i].dateTime > endTime)
+                {
                     continue;
+                }
 
                 // aggregate data
                 recordedAmount[0] += list[i].temp;
@@ -125 +126 @@
                 recordedAmount[2] += list[i].wind;
 
                 if (ValueToConditions.TransferLuxToConditions(list[i].lum * 1000) != WeatherConditions.Dark)
+                {
                     recordedAmount[3] += list[i].lum * 1000; weatherValues++;
+                }
 
                 values++;
             }
 
             // data from last day
-            WeatherInfo dayInfo2 = new WeatherInfo(lastStartDay, recordedAmount[0] / values, (int)(recordedAmount[1] / values * 100), recordedAmount[2] / values, recordedAmount[3] / values, range); 
-            weatherInfo.Add(dayInfo2);
+            if (values != 0)
+            {
+                WeatherInfo dayInfo2 = new WeatherInfo(lastStartDay, recordedAmount[0] / values, (int)(recordedAmount[1] / values * 100), recordedAmount[2] / values, recordedAmount[3] / weatherValues, range);
+                weatherInfo.Add(dayInfo2);
+            }
 
             return weatherInfo;
         }
@@ -149 +155 @@
         {
             List<WeatherInfo> weatherInfo = new List<WeatherInfo>();
 
-            if (!File.Exists(path))
-                return weatherInfo;
-
             List<WeatherInstance> list = loader.LoadWeatherFile(path);
+            if (list == null)
+                return weatherInfo;
 
             // min/max hour taken into account
             int[] minmaxHour = new int[] { 7, 18 };
@@ -169 +174 @@
             {
                 to[i] = minmaxHour[0] + interval * (i + 1);
                 data[i] = new double[4];
+                count[i] = 0;
             }
 
             // first day
@@ -208 +214 @@
                     lastStartTime = date;
                     count = new int[indices];
                     for (int l = 0; l < data.Length; l++)
+                    {
                         data[l] = new double[4];
+                        count[l] = 0;
+                    }
                 }
 
                 // if not in allowed time window -> discard