Changeset 17477 for branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Converters/ValueTypeArrayConverter.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/ValueTypeArrayConverter.cs (modified) (8 diffs)

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

@@ -16 +16 @@
     public override void Inject(IItem item, IJsonItem data, IJsonItemConverter root) {
       IntArray arr = item as IntArray;
-      int[] d = CastValue<int[]>(data);
+      IntArrayJsonItem intArrayItem = data as IntArrayJsonItem;
       bool resizeTmp = arr.Resizable;
       arr.Resizable = true;
-      arr.Length = d.Length;
-      for (int i = 0; i < d.Length; ++i)
-        arr[i] = d[i];
+      arr.Length = intArrayItem.Value.Length;
+      for (int i = 0; i < intArrayItem.Value.Length; ++i)
+        arr[i] = intArrayItem.Value[i];
       arr.Resizable = resizeTmp;
     }
@@ -27 +27 @@
     public override IJsonItem Extract(IItem value, IJsonItemConverter root) =>
       new IntArrayJsonItem() {
-        Name = "[OverridableParamName]",
+        Name = value.ItemName,
         Description = value.ItemDescription,
         Value = ((IntArray)value).CloneAsArray(),
@@ -41 +41 @@
     public override void Inject(IItem item, IJsonItem data, IJsonItemConverter root) {
       DoubleArray arr = item as DoubleArray;
-      DoubleArrayJsonItem doubleItem = data as DoubleArrayJsonItem;
-      //double[] d = CastValue<double[]>(data);
+      DoubleArrayJsonItem doubleArrayItem = data as DoubleArrayJsonItem;
       bool resizeTmp = arr.Resizable;
       arr.Resizable = true;
-      //arr.Length = d.Length;
-      arr.Length = doubleItem.Value.Length;
-      for (int i = 0; i < doubleItem.Value.Length; ++i)
-        arr[i] = doubleItem.Value[i];
+      arr.Length = doubleArrayItem.Value.Length;
+      for (int i = 0; i < doubleArrayItem.Value.Length; ++i)
+        arr[i] = doubleArrayItem.Value[i];
       arr.Resizable = resizeTmp;
     }
@@ -54 +52 @@
     public override IJsonItem Extract(IItem value, IJsonItemConverter root) =>
       new DoubleArrayJsonItem() {
-        Name = "[OverridableParamName]",
+        Name = value.ItemName,
         Description = value.ItemDescription,
         Value = ((DoubleArray)value).CloneAsArray(),
@@ -68 +66 @@
     public override void Inject(IItem item, IJsonItem data, IJsonItemConverter root) {
       PercentArray arr = item as PercentArray;
-      double[] d = CastValue<double[]>(data);
+      DoubleArrayJsonItem doubleArrayItem = data as DoubleArrayJsonItem;
       bool resizeTmp = arr.Resizable;
       arr.Resizable = true;
-      arr.Length = d.Length;
-      for (int i = 0; i < d.Length; ++i)
-        arr[i] = d[i];
+      arr.Length = doubleArrayItem.Value.Length;
+      for (int i = 0; i < doubleArrayItem.Value.Length; ++i)
+        arr[i] = doubleArrayItem.Value[i];
       arr.Resizable = resizeTmp;
     }
@@ -79 +77 @@
     public override IJsonItem Extract(IItem value, IJsonItemConverter root) =>
       new DoubleArrayJsonItem() {
-        Name = "[OverridableParamName]",
+        Name = value.ItemName,
         Description = value.ItemDescription,
         Value = ((PercentArray)value).CloneAsArray(),
@@ -93 +91 @@
     public override void Inject(IItem item, IJsonItem data, IJsonItemConverter root) {
       BoolArray arr = item as BoolArray;
-      bool[] d = CastValue<bool[]>(data);
+      BoolArrayJsonItem boolArrayItem = data as BoolArrayJsonItem;
       bool resizeTmp = arr.Resizable;
       arr.Resizable = true;
-      arr.Length = d.Length;
-      for(int i = 0; i < d.Length; ++i)
-        arr[i] = d[i];
+      arr.Length = boolArrayItem.Value.Length;
+      for(int i = 0; i < boolArrayItem.Value.Length; ++i)
+        arr[i] = boolArrayItem.Value[i];
       arr.Resizable = resizeTmp;
     }
@@ -104 +102 @@
     public override IJsonItem Extract(IItem value, IJsonItemConverter root) =>
       new BoolArrayJsonItem() {
-        //Name = "[OverridableParamName]",
         Name = value.ItemName,
         Description = value.ItemDescription,