Changeset 17477 for branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Converters/ValueLookupParameterConverter.cs

Timestamp:

03/17/20 12:33:35 (4 years ago)

Author:

dpiringe

Message:

#3026:

• refactored JsonTemplateInstantiator -> now returns a InstantiatorResult which contains the optimizer and an IEnumerable of IResultJsonItem
• code cleanup in JCGenerator
• relocated the serialization of json items into IJsonItem with method GenerateJObject (virtual base implementation in JsonItem)
  • this allows custom serialization for json items (example: ValueLookupJsonItem)
  • items of interface IIntervalRestrictedJsonItem have a custom implementation of GenerateJObject -> hides Minimum and Maximum if the values are the physically min/max of their type
• code cleanup in BaseConverter

File:

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

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

@@ -15 +15 @@
       IValueLookupJsonItem lookupItem = data as IValueLookupJsonItem;
       param.ActualName = lookupItem.ActualName;
-      if (param.Value != null)
-        root.Inject(param.Value, lookupItem.JsonItemReference, root);
+      if (param.Value != null && lookupItem.ActualValue != null)
+        root.Inject(param.Value, lookupItem.ActualValue, root);
     }
 
@@ -26 +26 @@
       if (param.Value != null) {
         IJsonItem tmp = root.Extract(param.Value, root);
-        item.AddChildren(tmp.Children);
-        item.JsonItemReference = tmp;
+        tmp.Parent = item;
+        //item.AddChildren(tmp.Children);
+        item.ActualValue = tmp;
       }
       item.Name = param.Name;