Changeset 17280 for branches/3026_IntegrationIntoSymSpace/HeuristicLab.Manufacture/ParameterTransformer/ConstrainedValueParameterTransformer.cs

Timestamp:

10/01/19 12:58:25 (5 years ago)

Author:

dpiringe

Message:

#3026

• renamed CustomWriter to CustomJsonWriter and extracted it into a separate file
• removed property ParameterizedItems from Component
• added helper methods for path generation in Component
• reverted the single parameter array idea back to the FreeParameters and StaticParameters idea
• now there hidden parameters are also handled

File:

• branches/3026_IntegrationIntoSymSpace/HeuristicLab.Manufacture/ParameterTransformer/ConstrainedValueParameterTransformer.cs (modified) (2 diffs)

branches/3026_IntegrationIntoSymSpace/HeuristicLab.Manufacture/ParameterTransformer/ConstrainedValueParameterTransformer.cs

@@ -17 +17 @@
     }
 
-    public override Component ExtractData(IParameter value) {
-
-      return new Component() {
+    public override Component ExtractData(IParameter value) =>
+      new Component() {
         Name = value.Name,
         Default = value.ActualValue?.GetType().Name,
         Range = GetValidValues(value),
-        ParameterizedItems = GetParameterizedChilds(value)
+        Parameters = GetParameterizedChilds(value)
       };
-    }
 
     #region Helper
@@ -34 +32 @@
       return list.ToArray();
     }
-
+    // id = kombi aus path + default 
     private IList<Component> GetParameterizedChilds(IParameter value) {
       List<Component> list = new List<Component>();
       var values = value.Cast<dynamic>().ValidValues;
       foreach(var x in values) {
-        if (x is IParameterizedItem &&
-            ((IParameterizedItem)x).Parameters.Any(p => !p.Hidden)) {
+        if (x is IParameterizedItem) {
           Component tmp = Transformer.Extract(x);
-          if (tmp.ParameterizedItems != null)
-            list.AddRange(tmp.ParameterizedItems);
-          else
-            list.Add(tmp);
+          tmp.PrependPath(value.Name);
+          list.Add(tmp);
         }
       }