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

Timestamp:

11/04/21 17:04:01 (2 years ago)

Author:

dpiringe

Message:

#3026

• added the dockerhub readme file
• fixed a bug which caused changed values (changed by events) to be overwritten with wrong values

File:

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

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

@@ -107 +107 @@
         var rcModifierItem = JsonItemConverter.Extract(rcModifier);
 
-        foreach (JObject param in parameters) {
-          var path = param[nameof(IJsonItem.Path)].ToString();
-          foreach (var item in rcModifierItem)
-            if (item.Path == path)
-              item.SetJObject(param);
-        }
+        SetJObjects(rcModifierItem, parameters);        
 
         JsonItemConverter.Inject(rcModifier, rcModifierItem);
@@ -124 +119 @@
       Objects.Add(root.Path, root);
 
-      foreach (JObject obj in Template[Constants.Parameters]) {
-        string path = obj.Property(nameof(IJsonItem.Path)).Value.ToString();
-        foreach(var tmp in root) {
-          if(tmp.Path == path) {
-            tmp.SetJObject(obj);
-            Objects.Add(tmp.Path, tmp);
+      foreach (var kvp in SetJObjects(root, Template[Constants.Parameters]))
+        Objects.Add(kvp);
+    }
+
+    private IDictionary<string, IJsonItem> SetJObjects(IJsonItem root, JToken parameters) {
+      var dict = new Dictionary<string, IJsonItem>();
+      foreach (JObject obj in parameters) {
+        var path = obj[nameof(IJsonItem.Path)].ToString();
+        foreach (var item in root) {
+          if (item.Path == path) {
+            item.SetJObject(obj);
+            item.Active = true;
+            dict.Add(item.Path, item);
           }
         }
       }
+      return dict;
     }
-    
+
     private void MergeTemplateWithConfig() {
       foreach (JObject obj in Config) {