Changeset 17280 for branches/3026_IntegrationIntoSymSpace/HeuristicLab.Manufacture/Component.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/Component.cs (modified) (5 diffs)

branches/3026_IntegrationIntoSymSpace/HeuristicLab.Manufacture/Component.cs

@@ -9 +9 @@
 
 namespace HeuristicLab.Manufacture {
+  //JsonItem
   public class Component {
     private IList<object> range;
@@ -23 +24 @@
       } 
     }
-    public string Path { get; set; }
+    public string Path { get; set; } = "";
 
     public IList<object> Range { 
@@ -43 +44 @@
 
     [JsonIgnore]
-    public IList<Component> ParameterizedItems { get; set; }
-
-    [JsonIgnore]
     public Component Reference { get; set; }
     
@@ -56 +54 @@
       target.Reference = from.Reference ?? target.Reference;
       target.Parameters = from.Parameters ?? target.Parameters;
-      target.ParameterizedItems = from.ParameterizedItems ?? target.ParameterizedItems;
       target.Operators = from.Operators ?? target.Operators;
     }
@@ -72 +69 @@
       IsInNumericRange<double>(data.Default, data.Range[0], data.Range[1]));
 
+
+
+    public void UpdatePaths() {
+      if (Parameters != null) {
+        foreach (var p in Parameters) {
+          p.Path = Path + "." + p.Name;
+        }
+      }
+
+      if (Operators != null) {
+        foreach (var p in Operators) {
+          p.Path = Path + "." + p.Name;
+        }
+      }
+    }
+
+    public void PrependPath(string str) {
+      Path = $"{str}.{Path}";
+      PrependPathHelper(Parameters, str);
+      PrependPathHelper(Operators, str);
+    }
+
+    private void PrependPathHelper(IEnumerable<Component> components, string str) {
+      if (components != null) {
+        foreach (var p in components)
+          p.PrependPath(str);
+      }
+    }
+
     #region Helper
-
     private static bool IsInRangeList(IEnumerable<object> list, object value) {
       foreach (var x in list)