Changeset 17342 for branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/JCGenerator.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/JCGenerator.cs (modified) (3 diffs)

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/JCGenerator.cs

@@ -59 +59 @@
       RefactorStaticParameters(obj);
 
-      obj.Property(nameof(JsonItem.Default))?.Remove();
+      obj.Property(nameof(JsonItem.Value))?.Remove();
       obj.Property(nameof(JsonItem.Type))?.Remove();
 
@@ -70 +70 @@
       TransformNodes(x => {
         var p = x.ToObject<JsonItem>();
-        if (p.Default == null || (p.Default != null && p.Default.GetType() == typeof(string) && p.Range == null)) {
+        if ((p.Value == null || (p.Value != null && p.Value.GetType() == typeof(string) && p.Range == null) && p.ActualName == null)) {
           objToRemove.Add(x);
         } else {
@@ -88 +88 @@
         x.Property(nameof(JsonItem.Parameters))?.Remove();
         x.Property(nameof(JsonItem.Type))?.Remove();
-        if (p.Default == null) objToRemove.Add(x);
+        if (p.Value == null) objToRemove.Add(x);
       }, token[Constants.StaticParameters]);
       foreach (var x in objToRemove) x.Remove();