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

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

Location:

branches/3026_IntegrationIntoSymSpace/HeuristicLab.Manufacture/ParameterTransformer

Files:

• ConstrainedValueParameterTransformer.cs (modified) (2 diffs)
• ParameterBaseTransformer.cs (modified) (1 diff)
• ParameterizedItemTransformer.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);
         }
       }

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

@@ -8 +8 @@
 namespace HeuristicLab.Manufacture {
   public abstract class ParameterBaseTransformer : BaseTransformer {
-    public override Component ExtractData(IItem value) => ExtractData(value.Cast<IParameter>());
+    public override Component ExtractData(IItem value) {
+      IParameter param = value.Cast<IParameter>();
+      Component comp = ExtractData(param);
+      //comp.Path = value.Cast<IParameter>().ActualValue?.ItemName;
+      /*comp.Path = value.Cast<IParameter>().Name + "." + comp.Path;
+      if(comp.ParameterizedItems != null) {
+        foreach (var item in comp.ParameterizedItems) {
+          item.Path = value.Cast<IParameter>().Name + "." + item.Path;
+        }
+      }*/
+      return comp;
+    }
     public abstract Component ExtractData(IParameter value);
 

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

@@ -9 +9 @@
 {
   public class ParameterizedItemTransformer : BaseTransformer {
-    
     public override void InjectData(IItem item, Component data) {
       IParameterizedItem pItem = item.Cast<IParameterizedItem>();
@@ -21 +20 @@
 
     public override Component ExtractData(IItem value) {
-      List<Component> list = new List<Component>();
-
       Component obj = new Component();
       obj.Name = value.ItemName;
       obj.Type = value.GetType().AssemblyQualifiedName;
-      obj.ParameterizedItems = list;
-      obj.Parameters = new List<Component>();
-      list.Add(obj);
+      obj.Path = value.ItemName;
 
       foreach (var param in value.Cast<IParameterizedItem>().Parameters) {
-        if (!param.Hidden) {
-          Component data = Transformer.Extract(param);
-          obj.Parameters.Add(data);
-          if(data.ParameterizedItems != null)
-            list.AddRange(data.ParameterizedItems);
-        }
+        Component data = Transformer.Extract(param);
+        data.Name = param.Name;
+        data.Path = param.Name;
+        data.PrependPath(obj.Path);
+        data.UpdatePaths();
+        
+        if (obj.Parameters == null)
+          obj.Parameters = new List<Component>();
+        obj.Parameters.Add(data);
       }
       return obj;