Revize 662b2404

Re #8832 integration

Server/ServerApp/Predictor/FeatureExtractor.cs

@@ -52 +52 @@
             }
 
             var res =  new List<ModelInput>();
-            // TODO use iterators to access records about attendance and weather together
-            foreach (Parser.OutputInfo.ActivityInfo val in dataParser.AttendanceList) {
-                if (buildings.Contains(val.building)) {
+            // use enumerator to access records about attendance and weather together
+            IEnumerator<Parser.OutputInfo.WeatherInfo> weatherEnumerator = dataParser.WeatherList.GetEnumerator();
+            weatherEnumerator.MoveNext();
+            foreach (Parser.OutputInfo.ActivityInfo val in dataParser.AttendanceList)
+            {
+                if (!weatherEnumerator.Current.startTime.Equals(val.startTime))
+                {
+                    weatherEnumerator.MoveNext();
+                }
+                if (buildings.Contains(val.building))
+                {
+                    Parser.OutputInfo.WeatherInfo weatherInfo = weatherEnumerator.Current;
                     res.Add(new ModelInput
                     {
-                        Temp = 0,
+                        Temp = (float)weatherInfo.temp,
                         Time = val.startTime,
+                        Wind = (float)weatherInfo.wind,
+                        Rain = (float)weatherInfo.rain,
                         // TODO convert val.amount to label
                     });
                 }