Changeset 17342 for branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Converters

Timestamp:

10/22/19 17:32:52 (5 years ago)

Author:

dpiringe

Message:

#3026

• in JsonItem:
  • renamed property Default to Value
  • removed usage of Reference for ValueLookupParameter
  • created new property ActualName for the actual name and using property Value for the value of an ValueLookupParameter
• fixed a bug in ValueTypeMatrixConverter -> now it correctly resizes ValueTypeMatrix<T>
• fixed a bug in ValueParameterConverter -> when ActualValue is null, but there is data for it, a new instance will get created

Location:

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Converters

Files:

• ConstrainedValueParameterConverter.cs (modified) (2 diffs)
• DummyConverter.cs (modified) (1 diff)
• EnumTypeConverter.cs (modified) (2 diffs)
• LookupParameterConverter.cs (modified) (1 diff)
• MultiCheckedOperatorConverter.cs (modified) (3 diffs)
• StringValueConverter.cs (modified) (1 diff)
• ValueLookupParameterConverter.cs (modified) (2 diffs)
• ValueParameterConverter.cs (modified) (1 diff)
• ValueTypeArrayConverter.cs (modified) (1 diff)
• ValueTypeMatrixConverter.cs (modified) (1 diff)
• ValueTypeValueConverter.cs (modified) (1 diff)

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

@@ -10 +10 @@
     public override void InjectData(IParameter parameter, JsonItem data) {
       foreach (var x in parameter.Cast<dynamic>().ValidValues)
-        if (x.GetType().Name == CastValue<string>(data.Default))
+        if (x.GetType().Name == CastValue<string>(data.Value))
           parameter.ActualValue = x;
 
@@ -20 +20 @@
       new JsonItem() {
         Name = value.Name,
-        Default = value.ActualValue?.GetType().Name,
+        Value = value.ActualValue?.GetType().Name,
         Range = GetValidValues(value),
         Parameters = GetParameterizedChilds(value)

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

@@ -14 +14 @@
 
     public override JsonItem ExtractData(IItem value) => 
-      new JsonItem() { Default = value.GetType().Name };
+      new JsonItem() { Value = value.GetType().Name };
   }
 }

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

@@ -12 +12 @@
       item.Cast<dynamic>().Value = Enum.Parse(
         item.GetType().GenericTypeArguments.First(), 
-        CastValue<string>(data.Default));
+        CastValue<string>(data.Value));
 
     public override JsonItem ExtractData(IItem value) {
@@ -18 +18 @@
       object val = ((dynamic)value).Value;
       Type enumType = val.GetType();
-      data.Default = Enum.GetName(enumType, val);
+      data.Value = Enum.GetName(enumType, val);
       data.Range = Enum.GetNames(enumType);
       return data;

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

@@ -11 +11 @@
       new JsonItem() { 
         Name = value.Name,
-        Default = value.Cast<ILookupParameter>().ActualName
+        ActualName = value.Cast<ILookupParameter>().ActualName
       };
 
     public override void InjectData(IParameter parameter, JsonItem data) =>
-      parameter.Cast<ILookupParameter>().ActualName = data.Default.Cast<string>();
-    
+      parameter.Cast<ILookupParameter>().ActualName = data.ActualName.Cast<string>();
   }
 }

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

@@ -11 +11 @@
       JsonItem data = base.ExtractData(value);
 
-      data.Default = value.GetType().Name;
+      data.Value = value.GetType().Name;
       data.Operators = new List<JsonItem>();
       dynamic val = value.Cast<dynamic>();
@@ -17 +17 @@
         data.Operators.Add(new JsonItem() {
           Name = op.Name,
-          Default = val.Operators.ItemChecked(op),
+          Value = val.Operators.ItemChecked(op),
           Range = new object[] { false, true },
           Path = data.Path + "." + op.Name
@@ -35 +35 @@
     private bool GetOperatorState(string name, JsonItem data) {
       foreach(var op in data.Operators) {
-        if (op.Name == name) return op.Default.Cast<bool>();
+        if (op.Name == name) return op.Value.Cast<bool>();
       }
       return false;

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

@@ -10 +10 @@
   public class StringValueConverter : BaseConverter {
     public override void InjectData(IItem item, JsonItem data) =>
-      item.Cast<StringValue>().Value = CastValue<string>(data.Default);
+      item.Cast<StringValue>().Value = CastValue<string>(data.Value);
 
     public override JsonItem ExtractData(IItem value) => 
       new JsonItem() {
-        Default = value.Cast<StringValue>().Value
+        Value = value.Cast<StringValue>().Value
       };
   }

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

@@ -10 +10 @@
     public override JsonItem ExtractData(IParameter value) {
       IValueLookupParameter param = value.Cast<IValueLookupParameter>();
+      object actualValue = null;
+      IList<object> actualRange = null;
+      if(param.Value != null) {
+        JsonItem tmp = JsonItemConverter.Extract(param.Value);
+        actualValue = tmp.Value;
+        actualRange = tmp.Range;
+      }
       return new JsonItem() {
         Name = value.Name,
-        Default = param.ActualName,
-        Reference = param.Value != null ? JsonItemConverter.Extract(param.Value) : null
+        ActualName = param.ActualName,
+        Value = actualValue,
+        Range = actualRange
       };
     }
@@ -19 +27 @@
     public override void InjectData(IParameter parameter, JsonItem data) {
       IValueLookupParameter param = parameter.Cast<IValueLookupParameter>();
-      param.ActualName = CastValue<string>(data.Default);
-      if (param.Value != null && data.Reference != null)
-        JsonItemConverter.Inject(param.Value, data.Reference);
+      param.ActualName = CastValue<string>(data.ActualName);
+      if (param.Value != null)
+        JsonItemConverter.Inject(param.Value, data);
     }
   }

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

@@ -9 +9 @@
   public class ValueParameterConverter : ParameterBaseConverter {
 
-    public override void InjectData(IParameter parameter, JsonItem data) => 
+    public override void InjectData(IParameter parameter, JsonItem data) {
+      if (parameter.ActualValue == null && data.Value != null)
+        parameter.ActualValue = Instantiate(parameter.DataType);
       JsonItemConverter.Inject(parameter.ActualValue, data);
+    }
 
     public override JsonItem ExtractData(IParameter value) {

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

@@ -14 +14 @@
   {
     public override void InjectData(IItem item, JsonItem data) => 
-      CopyArrayData(item.Cast<ArrayType>(), CastValue<T[]>(data.Default));
+      CopyArrayData(item.Cast<ArrayType>(), CastValue<T[]>(data.Value));
 
     public override JsonItem ExtractData(IItem value) => 
       new JsonItem() {
-        Default = value.Cast<ArrayType>().CloneAsArray()
+        Value = value.Cast<ArrayType>().CloneAsArray()
       };
 

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

@@ -14 +14 @@
   {
     public override void InjectData(IItem item, JsonItem data) => 
-      CopyMatrixData(item.Cast<MatrixType>(), CastValue<T[,]>(data.Default));
+      CopyMatrixData(item.Cast<MatrixType>(), CastValue<T[,]>(data.Value));
 
     public override JsonItem ExtractData(IItem value) =>
       new JsonItem() {
-        Default = value.Cast<MatrixType>().CloneAsMatrix()
+        Value = value.Cast<MatrixType>().CloneAsMatrix()
       };
 
     #region Helper
     private void CopyMatrixData(MatrixType matrix, T[,] data) {
+      var rowInfo = matrix.GetType().GetProperty("Rows");
+      rowInfo.SetValue(matrix, data.GetLength(0));
+      var colInfo = matrix.GetType().GetProperty("Columns");
+      colInfo.SetValue(matrix, data.GetLength(1));
+      //matrix.Cast<dynamic>().Columns = data.GetLength(1);
       for (int x = 0; x < data.GetLength(0); ++x) {
         for (int y = 0; y < data.GetLength(1); ++y) {

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

@@ -13 +13 @@
 
     public override void InjectData(IItem item, JsonItem data) =>
-      item.Cast<ValueType>().Value = CastValue<T>(data.Default);
+      item.Cast<ValueType>().Value = CastValue<T>(data.Value);
 
     public override JsonItem ExtractData(IItem value) => 
       new JsonItem() {
-        Default = value.Cast<ValueType>().Value,
+        Value = value.Cast<ValueType>().Value,
         Range = new object[] { GetMinValue(), GetMaxValue() }
       };