Changeset 17275 for branches/3026_IntegrationIntoSymSpace/HeuristicLab.Manufacture/JCGenerator.cs

Timestamp:

09/26/19 17:43:44 (5 years ago)

Author:

dpiringe

Message:

#3026

• deleted Util.cs
• BaseTransformer merges now the component with its reference (if a reference exists) -> easier handling for transformers with parameterizedItems
• MultiCheckedOperatorTransformer now sets the type name as default value
• added a type list at the end of the template file -> is needed to instantiate objects
• changed JCGenerator and JCInstantiator to test a format where FreeParameters and StaticParameters are saved as single Parameter array

File:

• branches/3026_IntegrationIntoSymSpace/HeuristicLab.Manufacture/JCGenerator.cs (modified) (6 diffs)

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

@@ -19 +19 @@
     private Stack<Formatting> formattings = new Stack<Formatting>();
     private int lvl = 0;
+    private bool isRangeArray = false;
     public override void WriteStartArray() {
       base.WriteStartArray();
+      /*
       if(lvl > ArrayFlatterLvl) {
         formattings.Push(base.Formatting);
@@ -26 +28 @@
       }
       lvl++;
+      */
+      if(isRangeArray) base.Formatting = Formatting.None;
     }
 
     public override void WriteEndArray() {
       base.WriteEndArray();
+      /*
       lvl--;
       if (lvl > ArrayFlatterLvl)
         base.Formatting = formattings.Pop();
+      */
+      if(isRangeArray) {
+        base.Formatting = Formatting.Indented;
+        isRangeArray = false;
+      }
+    }
+
+    public override void WritePropertyName(string name) {
+      base.WritePropertyName(name);
+      isRangeArray = name == "Range";
     }
 
@@ -54 +69 @@
         'Problem':''
       },
-      'Objects': []
+      'Objects': [],
+      'Types': {}
     }");
 
-    
     private Dictionary<string, string> TypeList = new Dictionary<string, string>();
     
@@ -69 +84 @@
       
       foreach(var item in items.Distinct()) {
-        JToken token = JObject.FromObject(item, Settings());
-        token["StaticParameters"] = token["Parameters"];
-        token["FreeParameters"] = token["Parameters"];
-        token.Cast<JObject>().Property("Parameters")?.Remove();
-        RefactorFreeParameters(token, freeParameters);
-        RefactorStaticParameters(token);
-        if(token["StaticParameters"].HasValues || token["FreeParameters"].HasValues)
+        JObject token = JObject.FromObject(item, Settings());
+        //token["StaticParameters"] = token["Parameters"];
+        //token["FreeParameters"] = token["Parameters"];
+
+        foreach (JObject x in token["Parameters"]) {
+          x.Property("Parameters")?.Remove();
+          x.Property("Type")?.Remove();
+        }
+        TypeList.Add(item.Name, item.Type);
+        RefactorParameters(token);
+        /*
+        foreach (JObject x in token["StaticParameters"]) {
+          x.Property("Parameters")?.Remove();
+          x.Property("Type")?.Remove();
+        }
+        foreach (JObject x in token["FreeParameters"]) {
+          x.Property("Parameters")?.Remove();
+          x.Property("Type")?.Remove();
+        }
+        */
+        //token.Cast<JObject>().Property("Parameters")?.Remove();
+        token.Property("Default")?.Remove();
+        token.Property("Type")?.Remove();
+
+        //RefactorFreeParameters(token, freeParameters);
+        //RefactorStaticParameters(token);
+        if (/*token["StaticParameters"].HasValues || token["FreeParameters"].HasValues ||*/ token["Parameters"].HasValues || (token["Operators"]?.HasValues ?? false))
           jsonItems.Add(token);
+
+        if(!token["Parameters"].HasValues) {
+          token.Property("Parameters")?.Remove();
+        }
       }
 
@@ -82 +121 @@
       template["Metadata"]["Problem"] = problem.Name;
       template["Objects"] = jsonItems;
+      template["Types"] = JObject.FromObject(TypeList);
 
       return CustomWriter.Serialize(template);
@@ -121 +161 @@
     }
 
+    private void RefactorParameters(JToken token) {
+      IList<JObject> objToRemove = new List<JObject>();
+      TransformNodes(x => {
+        var p = x.ToObject<Component>();
+        if (p.Default == null) objToRemove.Add(x);
+      }, token["Parameters"]);
+      foreach (var x in objToRemove) x.Remove();
+    }
+
     private JsonSerializer Settings() => new JsonSerializer() {
       TypeNameHandling = TypeNameHandling.None,