Changeset 17477 for branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/ValueLookupJsonItem.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/Models/ValueLookupJsonItem.cs (modified) (1 diff)

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Models/ValueLookupJsonItem.cs

@@ -5 +5 @@
 using System.Threading.Tasks;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 
 namespace HeuristicLab.JsonInterface {
   public class ValueLookupJsonItem : LookupJsonItem, IValueLookupJsonItem {
-    [JsonIgnore]
-    public IJsonItem JsonItemReference { get; set; }
+    
+    public IJsonItem ActualValue { get; set; }
 
     protected override bool Validate() {
-      if (JsonItemReference == null) return true;
+      if (ActualValue == null) return true;
       IList<IJsonItem> faultyItems = new List<IJsonItem>();
-      return JsonItemReference.GetValidator().Validate(ref faultyItems);
+      return ActualValue.GetValidator().Validate(ref faultyItems);
+    }
+
+    public override JObject GenerateJObject() {
+      var obj = base.GenerateJObject();
+      if(ActualValue != null) {
+        var actualValue = ActualValue.GenerateJObject();
+        obj.Add(nameof(IValueLookupJsonItem.ActualValue), actualValue);
+      }
+      return obj;
+    }
+
+    public override IEnumerator<IJsonItem> GetEnumerator() {
+      using (var it = base.GetEnumerator()) {
+        while(it.MoveNext()) {
+          yield return it.Current;
+        }
+      }
+      if(ActualValue != null) {
+        using (var it = ActualValue.GetEnumerator()) {
+          while (it.MoveNext()) {
+            yield return it.Current;
+          }
+        }
+      }
     }
   }