Changeset 17394 for branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/JsonTemplateInstantiator.cs

Timestamp:

01/07/20 16:25:39 (4 years ago)

Author:

dpiringe

Message:

#3026:

• deleted: ConvertableAttribute, DummyConverter, ObjectExtensions
• renamed: CustomJsonWriter -> SingleLineArrayJsonWriter, JCInstantiator -> JsonTemplateInstantiator
• added: JsonItemConverterFactory, UnsupportedJsonItem
• IJsonItemConverter:
  • added two new properties: Priority and ConvertableType -> because converters are automatically collected by plugin infrastructure now
  • Extract, Inject references a root converter now -> typically an instance of JsonItemConverter -> to prevent cycles
• JsonItemConverter:
  • now implements the interface IJsonItemConverter
  • is now a dynamic class
  • is only instantiable with an factory (JsonItemConverterFactory)
  • still has the old (but now public) static methods Extract and Inject (without ref param IJsonItemConverter root) -> creates instance with factory and calls methods of instance
  • removed register and unregister methods, because the factory collects all converters automatically now (on first call of Create)
  • has cycle detection for Extract and Inject
  • renamed method Get to GetConverter

File:

• branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/JsonTemplateInstantiator.cs (moved) (moved from branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/JCInstantiator.cs) (6 diffs)

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

@@ -11 +11 @@
 using HeuristicLab.Data;
 using HeuristicLab.Optimization;
-using HeuristicLab.SequentialEngine;
 using Newtonsoft.Json.Linq;
 
@@ -18 +17 @@
   /// Static class to instantiate an IAlgorithm object with a json interface template and config.
   /// </summary>
-  public static class JCInstantiator {
+  public static class JsonTemplateInstantiator {
     private struct InstData {
       public JToken Template { get; set; }
       public JArray Config { get; set; }
       public IDictionary<string, JsonItem> Objects { get; set; }
-      public IDictionary<string, JsonItem> ResolvedItems { get; set; }
     }
 
@@ -34 +32 @@
     public static IAlgorithm Instantiate(string templateFile, string configFile = "") {
       InstData instData = new InstData() {
-        Objects = new Dictionary<string, JsonItem>(),
-        ResolvedItems = new Dictionary<string, JsonItem>()
+        Objects = new Dictionary<string, JsonItem>()
       };
 
@@ -54 +51 @@
       // collect all parameterizedItems from template
       CollectParameterizedItems(instData);
-
-      // rebuild tree with paths
-      RebuildTree(instData);
-
+      
       // if config != null -> merge Template and Config 
       if (instData.Config != null)
@@ -79 +73 @@
     private static void CollectParameterizedItems(InstData instData) {
       foreach (JObject item in instData.Template[Constants.Parameters]) {
-        JsonItem data = JsonItem.BuildJsonItem(item);
-        instData.Objects.Add(data.Path, data);
-      }
-    }
-    
-    private static JsonItem RebuildTreeHelper(IList<JsonItem> col, string name) {
-      JsonItem target = null;
-      foreach (var val in col) {
-        if (val.Name == name)
-          target = val;
-      }
-      if (target == null) {
-        target = new JsonItem() {
-          Name = name,
-          Path = name,
-          Children = new List<JsonItem>()
-        };
-        col.Add(target);
-      }
-      return target;
-    }
-
-    // rebuilds item tree with splitting paths of each jsonitem
-    private static void RebuildTree(InstData instData) {
-      List<JsonItem> values = new List<JsonItem>();
-      foreach (var x in instData.Objects) {
-        string[] pathParts = x.Key.Split('.');
-        JsonItem target = RebuildTreeHelper(values, pathParts[0]);
-
-        for (int i = 1; i < pathParts.Length; ++i) {
-          target = RebuildTreeHelper(target.Children, pathParts[i]);
+        string[] pathParts = item.Property("Path").Value.ToString().Split('.');
+        
+        // rebuilds object tree
+        JsonItem parent = null;
+        StringBuilder partialPath = new StringBuilder();
+        for(int i = 0; i < pathParts.Length-1; ++i) {
+          partialPath.Append(pathParts[i]);
+          JsonItem tmp = null;
+          if (instData.Objects.TryGetValue(partialPath.ToString(), out JsonItem value)) {
+            tmp = value;
+          } else {
+            tmp = new JsonItem() { Name = pathParts[i] };
+            if (parent != null) parent.AddChilds(tmp);
+            instData.Objects.Add(partialPath.ToString(), tmp);
+          }
+          partialPath.Append(".");
+          parent = tmp;
         }
 
-        JsonItem.Merge(target, x.Value);
-      }
-      foreach(var val in values) {
-        instData.ResolvedItems.Add(val.Name, val);
+        JsonItem data = JsonItem.BuildJsonItem(item);
+        parent.AddChilds(data);
+        instData.Objects.Add(data.Path, data);
       }
     }
@@ -135 +114 @@
     private static JsonItem GetData(string key, InstData instData)
     {
-      if (instData.ResolvedItems.TryGetValue(key, out JsonItem value))
+      if (instData.Objects.TryGetValue(key, out JsonItem value))
         return value;
       else