Changeset 17354 for branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/JCGenerator.cs

Timestamp:

11/19/19 16:59:18 (5 years ago)

Author:

dpiringe

Message:

#3026:

• relocated BuildJsonItem from JCInstantiator into JsonItem
• in JsonItem: removed JContainer usage in setter for Value (now in BuildJsonItem)

File:

• branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/JCGenerator.cs (modified) (3 diffs)

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

@@ -75 +75 @@
 
       obj.Property(nameof(JsonItem.Parameters))?.Remove();
-      RefactorFreeParameters(obj);
-      RefactorStaticParameters(obj);
+      RefactorFreeParameters(obj, genData);
+      RefactorStaticParameters(obj, genData);
 
       obj.Property(nameof(JsonItem.Value))?.Remove();
@@ -87 +87 @@
 
     // deletes unnecessary properties for free parameters.
-    private static void RefactorFreeParameters(JToken token) {
+    private static void RefactorFreeParameters(JToken token, GenData genData) {
       IList<JObject> objToRemove = new List<JObject>();
       TransformNodes(x => {
-        var p = x.ToObject<JsonItem>();
+        var p = JsonItem.BuildJsonItem(x, genData.TypeList);
         x.Property(nameof(JsonItem.Type))?.Remove();
         x.Property(nameof(JsonItem.Parameters))?.Remove();
@@ -105 +105 @@
 
     // deletes unnecessary properties for static parameters.
-    private static void RefactorStaticParameters(JToken token) {
+    private static void RefactorStaticParameters(JToken token, GenData genData) {
       IList<JObject> objToRemove = new List<JObject>();
       TransformNodes(x => {
-        var p = x.ToObject<JsonItem>();
+        var p = JsonItem.BuildJsonItem(x, genData.TypeList);
         x.Property(nameof(JsonItem.Range))?.Remove();
         x.Property(nameof(JsonItem.Operators))?.Remove();