Revize 0e7b6b11

Re #9049 Implementation of GetDataFileNames and Load methods

Server/ServerApp/Predictor/PredictorConfiguration.cs

@@ -9 +9 @@
 
 namespace ServerApp.Predictor
 {
-    class PredictorConfiguration
+    public class PredictorConfiguration
     {
-        public static readonly string DEFAULT_CONFIG_PATH = Path.GetFullPath(Path.GetDirectoryName(Environment.CurrentDirectory) + @"\Predictor.config");
+        public static readonly string DEFAULT_CONFIG_PATH = Path.Combine(Path.GetDirectoryName(Environment.CurrentDirectory), "Predictor.config");
+
+        public static readonly string DEFAULT_MODEL_DATA_PATH = Path.Combine(Path.GetDirectoryName(Environment.CurrentDirectory), "model_data");
 
         public int TimeResolution { get; set; }
 
@@ -19 +21 @@
 
         public int PredictorCount { get; set; }
 
+        public string ModelDataPath { get; set; }
+
         public static PredictorConfiguration LoadConfig(string filename)
         {
             string json = System.IO.File.ReadAllText(filename);
@@ -44 +48 @@
             return new PredictorConfiguration
             {
                 TimeResolution = 3,
+                ModelDataPath = DEFAULT_MODEL_DATA_PATH,
                 PredictorCount = 7,
                 BuildingsToAreas = new Dictionary<string, int>
                 {