Revize 22211075

Revert "Merge branch 'PredictorAPI' into 'master'"

This reverts merge request !20

Server/ServerApp/Predictor/FeatureExtractor.cs

@@ -13 +13 @@
     /// <summary>
     /// A class responsible for preparation of features for classifiers.
     /// </summary>
-    class FeatureExtractor
+    public class FeatureExtractor
     {
         /// <summary>
         /// A DataParser instance used to access info objects.
         /// </summary>
-        private readonly IDataParser DataParser;
+        private readonly IDataParser dataParser;
 
-        /// <summary>
-        /// A configuration object of the <c>Predictor</c> package
-        /// </summary>
-        private PredictorConfiguration Configuration;
+        private Dictionary<string, int> buildingsToAreas;
 
         /// <summary>
         /// Instantiates new FeatureExtractor class.
         /// </summary>
         /// <param name="dataParser">Data parser used to access training data.</param>
-        public FeatureExtractor(IDataParser dataParser, PredictorConfiguration configuration)
+        public FeatureExtractor(IDataParser dataParser, Dictionary<string, int> buildingsToAreas)
         {
-            this.DataParser = dataParser;
-            this.Configuration = configuration;
+            this.dataParser = dataParser;
+            this.buildingsToAreas = buildingsToAreas;
         }
 
         /// <summary>
@@ -44 +41 @@
         /// <param name="interval"></param>
         /// <param name="wholeDay"></param>
         /// <returns></returns>
-        public List<ModelInput> PrepareTrainingInput(int area)
+        public List<ModelInput> PrepareTrainingInput(int area, DateTime startDate, DateTime endDate, int interval = 1, bool wholeDay = true)
         {
+            dataParser.Parse(startDate, endDate, interval, wholeDay);
             List<string> buildings = new List<string>();
 
             // find all buildings in area
-            foreach (KeyValuePair<string, int> kvp in Configuration.BuildingsToAreas)
+            foreach (KeyValuePair<string, int> kvp in buildingsToAreas)
             {
                 if (kvp.Value == area)
                 {
@@ -58 +56 @@
             }
 
             var res = new List<ModelInput>();
-            foreach (WeatherInfo val in DataParser.WeatherList)
+            foreach (WeatherInfo val in dataParser.WeatherList)
             {
                 res.Add(new ModelInput
                 {
-                    Time = val.startTime,
                     Temp = (float)val.temp,
-                    Hour = val.startTime.Hour,
+                    Time = val.startTime,
                     Wind = (float)val.wind,
                     Rain = (float)val.rain,
                 });
             }
 
-            List<ActivityInfo> attendance = DataParser.AttendanceList;
+            List<ActivityInfo> attendance = dataParser.AttendanceList;
             foreach (ModelInput input in res)
             {
                 List<int> amounts = new List<int>();
                 List<int> maxima = new List<int>();
                 foreach (string building in buildings)
                 {
-                    List<ActivityInfo> temp = attendance.Where(activity => activity.building.Equals(building)).ToList();
-                    amounts.Add(temp.Where(activity => activity.startTime.Equals(input.Time)).Select(activity => activity.amount).First());
-                    maxima.Add(temp.Select(activity => activity.amount).Max());
+
+                    amounts.Add(attendance.Where(activity => activity.building.Equals(building) && activity.startTime.Equals(input.Time)).Select(activity => activity.amount).First());
+                    maxima.Add(attendance.Where(activity => activity.building.Equals(building)).Select(activity => activity.amount).Max());
                 }
                 double ratio = amounts.Sum() / (double)maxima.Sum();
                 input.Label = RatioToLabel(ratio);
@@ -93 +90 @@
             if (ratio < 0.1f)
             {
                 return "10%";
-            }
-            else if (ratio < 0.2f)
+            } else if (ratio < 0.2f)
             {
                 return "20%";
-            }
-            else if (ratio < 0.3f)
+            } else if (ratio < 0.3f)
             {
                 return "30%";
-            }
-            else if (ratio < 0.4f)
+            } else if (ratio < 0.4f)
             {
                 return "40%";
-            }
-            else if (ratio < 0.5f)
+            } else if (ratio < 0.5f)
             {
                 return "50%";
-            }
-            else if (ratio < 0.6f)
+            } else if (ratio < 0.6f)
             {
                 return "60%";
-            }
-            else if (ratio < 0.7f)
-            {
+            } else if(ratio < 0.7f) {
                 return "70%";
-            }
-            else if (ratio < 0.8f)
+            } else if (ratio < 0.8f)
             {
                 return "80%";
-            }
-            else if (ratio < 0.9f)
+            } else if (ratio < 0.9f)
             {
                 return "90%";
-            }
-            else
+            } else
             {
                 return "100%";
             }
         }
 
-        internal double LabelToRatio(string label)
+        private double LabelToRatio(string label)
         {
-            if (label.Equals("10%"))
-            {
+            if (label.Equals("10%")) {
                 return 0.1f;
             }
-            else if (label.Equals("20%"))
-            {
+            else if (label.Equals("20%"))  {
                 return 0.2f;
             }
-            else if (label.Equals("30%"))
-            {
+            else if (label.Equals("30%")) {
                 return 0.3f;
             }
-            else if (label.Equals("40%"))
-            {
+            else if (label.Equals("40%")) {
                 return 0.4f;
             }
-            else if (label.Equals("50%"))
-            {
+            else if (label.Equals("50%")) {
                 return 0.5f;
             }
-            else if (label.Equals("60%"))
-            {
+            else if (label.Equals("60%")) {
                 return 0.6f;
             }
-            else if (label.Equals("70%"))
-            {
+            else if (label.Equals("70%")) {
                 return 0.7f;
             }
-            else if (label.Equals("80%"))
-            {
+            else if (label.Equals("80%")) {
                 return 0.8f;
             }
-            else if (label.Equals("90%"))
-            {
+            else if (label.Equals("90%")) {
                 return 0.9f;
             }
             else