Changeset 17420 for branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface

Timestamp:

02/03/20 17:32:50 (5 years ago)

Author:

dpiringe

Message:

#3026:

• refactored ranged based VMs -> created new 'base' class for ranged based VMs RangedValueBaseVM
• renamed AddChilds to AddChildren
• implemented ArrayValueVM and JsonItemArrayValueControl
• added ranges for array and matrix values

Location:

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface

Files:

• Converters/AlgorithmConverter.cs (modified) (2 diffs)
• Converters/ConstrainedValueParameterConverter.cs (modified) (1 diff)
• Converters/MultiCheckedOperatorConverter.cs (modified) (1 diff)
• Converters/ParameterizedItemConverter.cs (modified) (1 diff)
• Converters/RegressionProblemDataConverter.cs (modified) (3 diffs)
• Converters/ValueLookupParameterConverter.cs (modified) (1 diff)
• Converters/ValueParameterConverter.cs (modified) (1 diff)
• Converters/ValueRangeConverter.cs (modified) (2 diffs)
• Converters/ValueTypeArrayConverter.cs (modified) (4 diffs)
• Converters/ValueTypeMatrixConverter.cs (modified) (4 diffs)
• Interfaces/IJsonItem.cs (modified) (2 diffs)
• Models/JsonItem.cs (modified) (3 diffs)
• Models/JsonItems.cs (modified) (1 diff)

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

@@ -25 +25 @@
       IAlgorithm algorithm = value as IAlgorithm;
       foreach (var res in algorithm.Results) {
-        item.AddChilds(new ResultItem() {
+        item.AddChildren(new ResultItem() {
           Name = res.Name,
           Value = true,
@@ -31 +31 @@
         });
       }
-      item.AddChilds(root.Extract(algorithm.Problem, root));
+      item.AddChildren(root.Extract(algorithm.Problem, root));
       return item;
     }

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

@@ -35 +35 @@
         Range = GetValidValues(parameter).Select(x => x.ToString())
       };
-      item.AddChilds(GetParameterizedChilds(parameter));
+      item.AddChildren(GetParameterizedChilds(parameter));
 
       return item;

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

@@ -24 +24 @@
       dynamic val = value as dynamic;
       foreach (var op in val.Operators) {
-        item.AddChilds(new BoolJsonItem() {
+        item.AddChildren(new BoolJsonItem() {
           Name = op.Name,
           Value = val.Operators.ItemChecked(op),

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

@@ -29 +29 @@
           IJsonItem tmp = root.Extract(param, root);
           if (!(tmp is UnsupportedJsonItem))
-            item.AddChilds(tmp);
+            item.AddChildren(tmp);
         }
       }

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

@@ -27 +27 @@
       FieldInfo dataInfo = dataset.GetType().GetField("storableData", flags);
       // TODO: aufteilen in trainings und test daten abschnitte
-      item.AddChilds(new JsonItem() {
+      item.AddChildren(new JsonItem() {
         Name = "Dataset",
         Value = dataInfo.GetValue(dataset)
@@ -33 +33 @@
 
       IEnumerable<StringValue> variables = (IEnumerable<StringValue>)val.InputVariables;
-      item.AddChilds(new JsonItem() {
+      item.AddChildren(new JsonItem() {
         Name = "TargetVariable",
         Value = (object)targetVariable,
@@ -40 +40 @@
 
 
-      item.AddChilds(new JsonItem() {
+      item.AddChildren(new JsonItem() {
         Name = "AllowedInputVariables",
         Value = (object)val.AllowedInputVariables,

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

@@ -21 +21 @@
       IValueLookupParameter param = value as IValueLookupParameter;
 
-      IJsonItem item = new JsonItem() {
-        Name = param.Name,
-        ActualName = param.ActualName
-      };
+      IJsonItem item = new JsonItem() {};
 
-      object actualValue = null;
-      IEnumerable<object> actualRange = null;
       if (param.Value != null) {
         IJsonItem tmp = root.Extract(param.Value, root);
-        tmp.Parent = item;
+        /*tmp.Parent = item;
         actualValue = tmp.Value;
         actualRange = tmp.Range;
+        */
+        item = tmp;
       } else {
-        actualRange = new object[] { GetMinValue(param.DataType), GetMaxValue(param.DataType) };
+        item.Range = new object[] { GetMinValue(param.DataType), GetMaxValue(param.DataType) };
       }
-      item.Value = actualValue;
-      item.Range = actualRange;
+      item.Name = param.Name;
+      item.ActualName = param.ActualName;
       return item;
     }

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

@@ -34 +34 @@
             //JsonItem.Merge(item as JsonItem, tmp as JsonItem);
           } else
-            item.AddChilds(tmp);
+            item.AddChildren(tmp);
         }
       }

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

@@ -24 +24 @@
     public override IJsonItem Extract(IItem value, IJsonItemConverter root) {
       IntRange range = value as IntRange;
-      return new IntArrayJsonItem() {
+      return new IntRangeJsonItem() {
         Name = "[OverridableParamName]",
         Value = new int[] { range.Start, range.End },
@@ -45 +45 @@
     public override IJsonItem Extract(IItem value, IJsonItemConverter root) {
       DoubleRange range = value as DoubleRange;
-      return new DoubleArrayJsonItem() {
+      return new DoubleRangeJsonItem() {
         Name = "[OverridableParamName]",
         Value = new double[] { range.Start, range.End },

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

@@ -28 +28 @@
       new IntArrayJsonItem() {
         Name = "[OverridableParamName]",
-        Value = ((IntArray)value).CloneAsArray()
+        Value = ((IntArray)value).CloneAsArray(),
+        Range = new int[] { int.MinValue, int.MaxValue }
       };
   }
@@ -50 +51 @@
       new DoubleArrayJsonItem() {
         Name = "[OverridableParamName]",
-        Value = ((DoubleArray)value).CloneAsArray()
+        Value = ((DoubleArray)value).CloneAsArray(),
+        Range = new double[] { double.MinValue, double.MaxValue }
       };
   }
@@ -72 +74 @@
       new DoubleArrayJsonItem() {
         Name = "[OverridableParamName]",
-        Value = ((PercentArray)value).CloneAsArray()
+        Value = ((PercentArray)value).CloneAsArray(),
+        Range = new double[] { 0.0d, 1.0d }
       };
   }
@@ -94 +97 @@
       new BoolArrayJsonItem() {
         Name = "[OverridableParamName]",
-        Value = ((BoolArray)value).CloneAsArray()
+        Value = ((BoolArray)value).CloneAsArray(),
+        Range = new bool[] { false, true }
       };
   }

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

@@ -21 +21 @@
       new IntMatrixJsonItem() {
         Name = "[OverridableParamName]",
-        Value = Transform((IntMatrix)value)
+        Value = Transform((IntMatrix)value),
+        Range = new int[] { int.MinValue, int.MaxValue }
       };
   }
@@ -38 +39 @@
       new DoubleMatrixJsonItem() {
         Name = "[OverridableParamName]",
-        Value = Transform((DoubleMatrix)value)
+        Value = Transform((DoubleMatrix)value),
+        Range = new double[] { double.MinValue, double.MaxValue }
       };
   }
@@ -55 +57 @@
       new DoubleMatrixJsonItem() {
         Name = "[OverridableParamName]",
-        Value = Transform((PercentMatrix)value)
+        Value = Transform((PercentMatrix)value),
+        Range = new double[] { 0.0d, 1.0d }
       };
   }
@@ -72 +75 @@
       new BoolMatrixJsonItem() {
         Name = "[OverridableParamName]",
-        Value = Transform((BoolMatrix)value)
+        Value = Transform((BoolMatrix)value),
+        Range = new bool[] { false, true }
       };
   }

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Interfaces/IJsonItem.cs

@@ -15 +15 @@
 
     [JsonIgnore]
-    IList<IJsonItem> Children { get; }
+    IList<IJsonItem> Children { get; } //TODO: IEnumerable
 
     [JsonIgnore]
@@ -28 +28 @@
     IJsonItemValidator GetValidator();
 
-    void AddChilds(params IJsonItem[] childs);
+    void AddChildren(params IJsonItem[] childs);
 
-    void AddChilds(IEnumerable<IJsonItem> childs);
+    void AddChildren(IEnumerable<IJsonItem> childs);
   }
 }

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

@@ -2 +2 @@
 using System.Collections;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
-using HeuristicLab.Core;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 
 namespace HeuristicLab.JsonInterface {
@@ -74 +70 @@
 
     public JsonItem(IEnumerable<IJsonItem> childs) {
-      AddChilds(childs);
+      AddChildren(childs);
     }
     #endregion
@@ -94 +90 @@
 
     #region Public Methods
-    public void AddChilds(params IJsonItem[] childs) => 
-      AddChilds(childs as IEnumerable<IJsonItem>);
+    public void AddChildren(params IJsonItem[] childs) => 
+      AddChildren(childs as IEnumerable<IJsonItem>);
 
-    public void AddChilds(IEnumerable<IJsonItem> childs) {
+    public void AddChildren(IEnumerable<IJsonItem> childs) {
       if (Children == null)
         Children = new List<IJsonItem>();

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

@@ -8 +8 @@
   public class IntJsonItem : JsonItem<int> {}
   public class IntArrayJsonItem: JsonItem<int[], int> { }
+  public class IntRangeJsonItem : JsonItem<int[], int> { }
   public class IntMatrixJsonItem : JsonItem<int[][], int> { }
 
   public class DoubleJsonItem: JsonItem<double> {}
   public class DoubleArrayJsonItem: JsonItem<double[], double> { }
+  public class DoubleRangeJsonItem : JsonItem<double[], double> { }
   public class DoubleMatrixJsonItem : JsonItem<double[][], double> { }