Changeset 17473 for branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Converters/ValueRangeConverter.cs

Timestamp:

03/10/20 17:17:37 (4 years ago)

Author:

dpiringe

Message:

#3026:

• refactored inheritance structure of json items, now the default JsonItem is an abstract class without properties Value and Range -> splitted up into new interfaces
• updated view models for new json item structure
• updated SingleLineArrayJsonWriter

File:

• branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Converters/ValueRangeConverter.cs (modified) (4 diffs)

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

@@ -18 +18 @@
       IntRange range = item as IntRange;
       IntRangeJsonItem cdata = data as IntRangeJsonItem;
-      range.Start = cdata.Value[0];
-      range.End = cdata.Value[1];
+      range.Start = cdata.MinValue;
+      range.End = cdata.MaxValue;
     }
 
@@ -25 +25 @@
       IntRange range = value as IntRange;
       return new IntRangeJsonItem() {
-        Name = "[OverridableParamName]",
+        //Name = "[OverridableParamName]",
+        Name = value.ItemName,
         Description = value.ItemDescription,
-        Value = new int[] { range.Start, range.End },
-        Range = new int[] { int.MinValue, int.MaxValue }
+        MinValue = range.Start,
+        MaxValue = range.End,
+        Minimum = int.MinValue,
+        Maximum = int.MaxValue
       };
     }
@@ -40 +43 @@
       DoubleRange range = item as DoubleRange;
       DoubleRangeJsonItem cdata = data as DoubleRangeJsonItem;
-      range.Start = cdata.Value[0];
-      range.End = cdata.Value[1];
+      range.Start = cdata.MinValue;
+      range.End = cdata.MaxValue;
     }
 
@@ -47 +50 @@
       DoubleRange range = value as DoubleRange;
       return new DoubleRangeJsonItem() {
-        Name = "[OverridableParamName]",
+        //Name = "[OverridableParamName]",
+        Name = value.ItemName,
         Description = value.ItemDescription,
-        Value = new double[] { range.Start, range.End },
-        Range = new double[] { double.MinValue, double.MaxValue }
+        MinValue = range.Start,
+        MaxValue = range.End,
+        Minimum = double.MinValue,
+        Maximum = double.MaxValue
       };
     }