Changeset 17354 for branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/JCInstantiator.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/JCInstantiator.cs (modified) (3 diffs)

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

@@ -83 +83 @@
     private static void CollectParameterizedItems(InstData instData) {
       foreach (JObject item in instData.Template[Constants.Objects]) {
-        JsonItem data = BuildJsonItem(item, instData);
+        JsonItem data = JsonItem.BuildJsonItem(item, instData.TypeList);
         instData.ParameterizedItems.Add(data.Path, data);
       }
@@ -120 +120 @@
       foreach (JObject obj in instData.Config) {
         // build item from config object
-        JsonItem item = BuildJsonItem(obj, instData);
+        JsonItem item = JsonItem.BuildJsonItem(obj, instData.TypeList);
         // override default value
         if (instData.ConfigurableItems.TryGetValue(item.Path, out JsonItem param)) {
@@ -145 +145 @@
       } else throw new TypeLoadException($"Cannot find AssemblyQualifiedName for {data.Name}.");
     }
-
-    #region BuildJsonItemMethods
-    private static JsonItem BuildJsonItem(JObject obj, InstData instData) =>
-      new JsonItem() {
-        Name = obj[nameof(JsonItem.Name)]?.ToString(),
-        Path = obj[nameof(JsonItem.Path)]?.ToString(),
-        Value = obj[nameof(JsonItem.Value)]?.ToObject<object>(),
-        Range = obj[nameof(JsonItem.Range)]?.ToObject<object[]>(),
-        Type = GetType(obj[nameof(JsonItem.Path)]?.ToObject<string>(), instData),
-        ActualName = obj[nameof(JsonItem.ActualName)]?.ToString(),
-        Parameters = PopulateParameters(obj, instData),
-        Operators = PopulateOperators(obj, instData)
-      };
-
-    private static string GetType(string path, InstData instData) {
-      if(!string.IsNullOrEmpty(path))
-        if (instData.TypeList.TryGetValue(path, out string value))
-          return value;
-      return null;
-    }
-
-    private static IList<JsonItem> PopulateParameters(JObject obj, InstData instData) {
-      IList<JsonItem> list = new List<JsonItem>();
-
-      // add staticParameters
-      if (obj[Constants.StaticParameters] != null)
-        foreach (JObject param in obj[Constants.StaticParameters])
-          list.Add(BuildJsonItem(param, instData));
-
-      // merge staticParameter with freeParameter
-      if (obj[Constants.FreeParameters] != null) {
-        foreach (JObject param in obj[Constants.FreeParameters]) {
-          JsonItem tmp = BuildJsonItem(param, instData);
-          
-          // search staticParameter from list
-          JsonItem comp = null;
-          foreach (var p in list)
-            if (p.Name == tmp.Name) comp = p;
-          if (comp == null)
-            throw new InvalidDataException($"Invalid {Constants.FreeParameters.Trim('s')}: '{tmp.Name}'!");
-
-          JsonItem.Merge(comp, tmp);
-        }
-      }
-      return list;
-    }
-
-    private static IList<JsonItem> PopulateOperators(JObject obj, InstData instData) {
-      IList<JsonItem> list = new List<JsonItem>();
-      JToken operators = obj[nameof(JsonItem.Operators)];
-      if (operators != null)
-        foreach (JObject sp in operators)
-          list.Add(BuildJsonItem(sp, instData));
-      return list;
-    }
-    #endregion
     #endregion
   }