Changeset 17339 for branches

Timestamp:

10/21/19 16:14:49 (4 years ago)

Author:

dpiringe

Message:

#3026 fixed a bug with path generation

Location:

branches/3026_IntegrationIntoSymSpace

Files:

• HeuristicLab.JsonInterface.App/Runner.cs (modified) (1 diff)
• HeuristicLab.JsonInterface.OptimizerIntegration/FileManager.cs (modified) (1 diff)
• HeuristicLab.JsonInterface/Converters/ConstrainedValueParameterConverter.cs (modified) (2 diffs)
• HeuristicLab.JsonInterface/Converters/ParameterizedItemConverter.cs (modified) (1 diff)
• HeuristicLab.JsonInterface/JCGenerator.cs (modified) (1 diff)
• HeuristicLab.JsonInterface/JCInstantiator.cs (modified) (2 diffs)
• HeuristicLab.JsonInterface/JsonItem.cs (modified) (5 diffs)

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.App/Runner.cs

@@ -14 +14 @@
       IAlgorithm alg = instantiator.Instantiate(template, config);
   
-      //alg.Start();
       Task task = alg.StartAsync();
       while(!task.IsCompleted) {
         WriteResultsToFile(outputFile, alg);
-        Thread.Sleep(1000);
+        Thread.Sleep(100);
       }
       WriteResultsToFile(outputFile, alg);

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.OptimizerIntegration/FileManager.cs

@@ -45 +45 @@
           JCGenerator gen = new JCGenerator();
           IAlgorithm alg = namedItem as IAlgorithm;
-          Task.Run(() => {
-            File.WriteAllText(saveFileDialog.FileName, gen.GenerateTemplate(alg));
-          });
+          File.WriteAllText(saveFileDialog.FileName, gen.GenerateTemplate(alg));
         }
       }

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Converters/ConstrainedValueParameterConverter.cs

@@ -32 +32 @@
       return list.ToArray();
     }
-    // id = kombi aus path + default 
+
     private IList<JsonItem> GetParameterizedChilds(IParameter value) {
       List<JsonItem> list = new List<JsonItem>();
@@ -39 +39 @@
         if (x is IParameterizedItem) {
           JsonItem tmp = JsonItemConverter.Extract(x);
-          tmp.PrependPath(value.Name);
           list.Add(tmp);
         }

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Converters/ParameterizedItemConverter.cs

@@ -22 +22 @@
       item.Name = value.ItemName;
       item.Type = value.GetType().AssemblyQualifiedName;
-      item.Path = value.ItemName;
 
       foreach (var param in value.Cast<IParameterizedItem>().Parameters) {
         JsonItem data = JsonItemConverter.Extract(param);
         data.Name = param.Name;
-        data.Path = data.Name;
-        data.PrependPath(item.Path);
-        data.UpdatePaths();
         
         if (item.Parameters == null)

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/JCGenerator.cs

@@ -10 +10 @@
 namespace HeuristicLab.JsonInterface {
   public class JCGenerator {
-
     private JObject template = JObject.Parse(Constants.Template);
     private Dictionary<string, string> TypeList = new Dictionary<string, string>();

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/JCInstantiator.cs

@@ -52 +52 @@
       //7. get problem data and object
       JsonItem problemData = GetData(problemName);
-      
       IProblem problem = CreateObject<IProblem>(problemData);
       algorithm.Problem = problem;
@@ -58 +57 @@
       //8. inject configuration
       JsonItemConverter.Inject(algorithm, algorithmData);
-      //JsonItemConverter.Inject(problem, problemData);
+      JsonItemConverter.Inject(problem, problemData);
 
-      if (algorithm is EngineAlgorithm) {
+      if (algorithm is EngineAlgorithm)
         algorithm.Cast<EngineAlgorithm>().Engine = new SequentialEngine.SequentialEngine();
-        File.WriteAllText(@"C:\Workspace\test2.txt", "test");
-      }
 
       return algorithm;

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/JsonItem.cs

@@ -10 +10 @@
 namespace HeuristicLab.JsonInterface {
   public class JsonItem {
-    private IList<object> range;
-    private object defaultValue;
-
-    public string Name { get; set; }
+    
+    private string name;
+    public string Name { 
+      get => name; 
+      set {
+        name = value;
+        Path = Name;
+        UpdatePath();
+      } 
+    }
     public string Type { get; set; }
     public string Path { get; set; }
@@ -19 +25 @@
     public IList<JsonItem> Operators { get; set; }
 
+    private object defaultValue;
     public object Default {
       get => defaultValue; 
@@ -28 +35 @@
     }
 
+    private IList<object> range;
     public IList<object> Range { 
       get => range; 
@@ -65 +73 @@
       IsInNumericRange<double>(data.Default, data.Range[0], data.Range[1]));
 
-    public void UpdatePaths() {
+    public void UpdatePath() {
       if (Parameters != null)
-        foreach (var p in Parameters)
-          p.Path = $"{Path}.{p.Name}";
+        UpdatePathHelper(Parameters);
 
-      if (Operators != null) 
-        foreach (var p in Operators)
-          p.Path = $"{Path}.{p.Name}";
-    }
+      if (Operators != null)
+        UpdatePathHelper(Operators);
 
-    public void PrependPath(string str) {
-      Path = $"{str}.{Path}";
-      PrependPathHelper(Parameters, str);
-      PrependPathHelper(Operators, str);
+      if(Reference != null)
+        UpdatePathHelper(Reference);
     }
 
     #region Helper
+    private void UpdatePathHelper(params JsonItem[] items) => 
+      UpdatePathHelper((IEnumerable<JsonItem>)items);
+
+    private void UpdatePathHelper(IEnumerable<JsonItem> items) {
+      foreach (var item in items) {
+        item.Path = $"{Path}.{item.Name}";
+        item.UpdatePath();
+      }
+    }
+
     private static bool IsInRangeList(IEnumerable<object> list, object value) {
       foreach (var x in list)
@@ -92 +105 @@
         (((T)min).CompareTo(value) == -1 || ((T)min).CompareTo(value) == 0) &&
         (((T)max).CompareTo(value) == 1 || ((T)max).CompareTo(value) == 0));
-
-    private void PrependPathHelper(IEnumerable<JsonItem> items, string str) {
-      if (items != null)
-        foreach (var p in items)
-          p.PrependPath(str);
-    }
     #endregion
   }