Changeset 17439 for branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Converters/MultiCheckedOperatorConverter.cs

Timestamp:

02/17/20 15:13:17 (4 years ago)

Author:

dpiringe

Message:

#3026:

• fixed a bug in HeuristicLab.JsonInterface.App -> now the Runner checks if the instantiated optimizer is an EngineAlgorithm, if true: Engine = SequentialEngine (engine can be configured in later versions)
• added a TabControl in ExportJsonDialog for parameters and results
• updated parameter tree view with checkboxes (and linked them with VM)
• renamed ActivatedResults to Results for templates
• fixed a bug with injection of operators in MultiCheckedOperatorConverter -> now operators of an ValueParameter get set correctly
• updated MultiCheckedOperatorConverter to extract/inject parameters of operators
• fixed bug with path for template -> removed usage of method Path.GetDirectoryName, returned wrong results
• splitted cache for JsonItemConverter into a cache for injection and extraction
• JsonTemplateInstantiator now uses first item in objects array instead of searching for an object with template name

File:

• branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Converters/MultiCheckedOperatorConverter.cs (modified) (3 diffs)

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

@@ -16 +16 @@
 
       dynamic val = item as dynamic;
-      foreach (var op in val.Operators)
-        val.Operators.SetItemCheckedState(op, GetOperatorState(op.Name, data));
+      foreach (var op in val.Operators) {
+        IJsonItem childItem = GetChildItem(op.Name, data);
+        if(childItem != null) {
+          if(childItem.Value is bool b) {
+            val.Operators.SetItemCheckedState(op, b);
+          }
+          root.Inject((IItem)op, childItem, root);
+        }
+      }
     }
 
@@ -24 +31 @@
       dynamic val = value as dynamic;
       foreach (var op in val.Operators) {
-        item.AddChildren(new BoolJsonItem() {
+        IJsonItem operatorItem = new BoolJsonItem() {
           Name = op.Name,
           Description = op.Description,
           Value = val.Operators.ItemChecked(op),
           Range = new bool[] { false, true }
-        });
+        };
+        IJsonItem c = root.Extract((IItem)op, root);
+        if(c != null && c.Children != null)
+          operatorItem.AddChildren(c.Children);
+        item.AddChildren(operatorItem);
       }
       return item;
@@ -42 +53 @@
       return false;
     }
+
+    private IJsonItem GetChildItem(string name, IJsonItem parent) {
+      foreach(var c in parent.Children) {
+        if (c.Name == name) return c;
+      }
+      return null;
+    }
     #endregion
   }