Changeset 17379 for branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/Converters/ConstrainedValueParameterConverter.cs

Timestamp:

12/17/19 17:16:03 (4 years ago)

Author:

dpiringe

Message:

#3026:

• removed classes:
  • CheckedItemListConverter: unnecessary
  • ItemCollectionConverter: unnecessary
  • PrimitiveConverter: not possible to implement because it needs to Extract/Inject from/into objects (but interfaces pretends IItem)
  • StorableConverter: unnecessary
  • ConfigurableConverter: unnecessary
• removed graphviz code in Heuristiclab.ConfigStarter/Program.cs
• updated Constants
• some simple code refactors in BaseConverter
• in JsonItem:
  • renamed Parameters -> Children
  • removed Properties: Operators, Type, Reference, IsConfigurable, IsParameterizedItem
  • removed unnecessary/old code
• implemented a new way to get data from an object, which is a matrix, in ValueTypeMatrixConverter method: CopyMatrixData
  • converts the object into an array -> rows: from array.Length, cols: when the length is > 0 pick length of first array of index 0 (it is saved as an array of arrays)
• created a binding flag const in ValueRangeConverter to prevent duplicates in code

File:

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

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

@@ -14 +14 @@
           parameter.ActualValue = x;
 
-      if (parameter.ActualValue is IParameterizedItem && data.Reference != null)
-        JsonItemConverter.Inject(parameter.ActualValue, data.Reference);
+      if (parameter.ActualValue is IParameterizedItem && data.Children != null) {
+        foreach(var param in data.Children) {
+          if(param.Name == parameter.ActualValue.ItemName)
+            JsonItemConverter.Inject(parameter.ActualValue, param);
+        }
+      }
     }
 
@@ -23 +27 @@
         Value = value.ActualValue?.ToString(),
         Range = GetValidValues(value).Select(x => x.ToString()),
-        Parameters = GetParameterizedChilds(value)
+        Children = GetParameterizedChilds(value)
       };