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

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

File:

• branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Converters/ValueLookupParameterConverter.cs (modified) (2 diffs)

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);
     }
   }