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

Timestamp:

01/28/20 14:53:45 (4 years ago)

Author:

dpiringe

Message:

#3026:

• deleted JsonItemArrayControl and JsonItemDefaultControl
• redesigned architecture for JsonItem: now there are different types of JsonItem (IntJsonItem, BoolJsonItem, ...) -> for better type safety and expandability
• fixed bug in BaseConverter for GetMinValue and GetMaxValue for IntValue, but ignored for other value types (DoubleValue, DateTimeValue, ...) because the redesign of JsonItem-Architecture can make these two methods obsolet soon
• fixed bug in JsonItemConverter to prevent null pointer exceptions
• refactored value and range converters -> removed complicated generic ValueTypeValueConverter and ValueRangeConverter and implemented the necessary methods directly in concrete classes (improves readability and removes the need of reflection)
• redesigned view handling in OptimizerIntegration -> dynamically seaches for JsonItemVMBase implementations, which are connected with a view
  • this enables better scaling with more user controls
• JsonItemVMBase implements MVVM architecture

File:

• branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/JsonTemplateInstantiator.cs (modified) (5 diffs)

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

@@ -22 +22 @@
       public JArray Config { get; set; }
       public IDictionary<string, IJsonItem> Objects { get; set; }
+      public IOptimizer Optimizer { get; set; }
     }
 
@@ -47 +48 @@
       ProtoBufSerializer serializer = new ProtoBufSerializer();
       IOptimizer optimizer = (IOptimizer)serializer.Deserialize(hLFileLocation);
+      instData.Optimizer = optimizer;
 
       // collect all parameterizedItems from template
@@ -65 +67 @@
 
     #region Helper
+
+    private static object GetValueFromJObject(JObject obj) {
+      object val = obj[nameof(IJsonItem.Value)]?.ToObject<object>();
+      if (val is JContainer jContainer) // for resolving array values
+        val = jContainer.ToObject<object[]>();
+
+      return val;
+    }
+
     private static void CollectParameterizedItems(InstData instData) {
+      //JCGenerator generator = new JCGenerator();
+      //IEnumerable<IJsonItem> items = generator.FetchJsonItems(instData.Optimizer);
+      IJsonItem root = JsonItemConverter.Extract(instData.Optimizer);
+      instData.Objects.Add(root.Path, root);
+
+      foreach (JObject obj in instData.Template[Constants.Parameters]) {
+        string[] pathParts = obj.Property("Path").Value.ToString().Split('.');
+        IJsonItem tmp = root;
+        IJsonItem old = null;
+        for(int i = 1; i < pathParts.Length; ++i) {
+          foreach(var c in tmp.Children) {
+            if (c.Name == pathParts[i])
+              tmp = c;
+          }
+          if (old == tmp)
+            throw new Exception($"Invalid path '{string.Join(".", pathParts)}'");
+          else old = tmp;
+        }
+        tmp.Value = GetValueFromJObject(obj);
+        tmp.Range = obj[nameof(IJsonItem.Range)]?.ToObject<object[]>();
+        tmp.ActualName = obj[nameof(IJsonItem.ActualName)]?.ToString();
+        instData.Objects.Add(tmp.Path, tmp);
+      }
+
+
+      /*
       foreach (JObject item in instData.Template[Constants.Parameters]) {
         string[] pathParts = item.Property("Path").Value.ToString().Split('.');
@@ -89 +126 @@
         parent.AddChilds(data);
         instData.Objects.Add(data.Path, data);
-      }
+      }*/
     }
     
@@ -95 +132 @@
       foreach (JObject obj in instData.Config) {
         // build item from config object
-        IJsonItem item = JsonItem.BuildJsonItem(obj);
+        //IJsonItem item = JsonItem.BuildJsonItem(obj);
+        string path = obj.Property("Path").Value.ToString();
         // override default value
-        if (instData.Objects.TryGetValue(item.Path, out IJsonItem param)) {
-          param.Value = item.Value;
+        if (instData.Objects.TryGetValue(path, out IJsonItem param)) {
+          param.Value = GetValueFromJObject(obj);
           // override ActualName (for LookupParameters)
           if (param.ActualName != null)
-            param.ActualName = item.ActualName;
-        } else throw new InvalidDataException($"No parameter with path='{item.Path}' defined!");
+            param.ActualName = obj[nameof(IJsonItem.ActualName)]?.ToString();
+        } else throw new InvalidDataException($"No parameter with path='{path}' defined!");
       }
     }