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

Timestamp:

01/27/20 10:33:01 (4 years ago)

Author:

dpiringe

Message:

#3026

• added interfaces IJsonItem and IJsonItemValidator
• replaced every reference JsonItem with IJsonItem

File:

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

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

@@ -17 +17 @@
     private JObject Template { get; set; }
     private JArray JArrayItems { get; set; }
-    private IList<JsonItem> JsonItems { get; set; }
+    private IList<IJsonItem> JsonItems { get; set; }
     private IOptimizer Optimizer { get; set; }
 
@@ -24 +24 @@
       // data container
       JArrayItems = new JArray();
-      JsonItems = new List<JsonItem>();
+      JsonItems = new List<IJsonItem>();
 
       ProtoBufSerializer serializer = new ProtoBufSerializer();
@@ -40 +40 @@
     }
 
-    public string GenerateTemplate(IEnumerable<JsonItem> items) {
+    public string GenerateTemplate(IEnumerable<IJsonItem> items) {
       ProtoBufSerializer serializer = new ProtoBufSerializer();
       serializer.Serialize(Optimizer, @"C:\Workspace\template.hl");
@@ -61 +61 @@
     }
 
-    public string GenerateTemplate(JsonItem rootItem, IOptimizer optimizer) {
+    public string GenerateTemplate(IJsonItem rootItem, IOptimizer optimizer) {
       // data container
       Template = JObject.Parse(Constants.Template);
-      JsonItems = new List<JsonItem>();
+      JsonItems = new List<IJsonItem>();
 
       // extract JsonItem, save the name in the metadata section of the 
@@ -92 +92 @@
     }
 
-    public IEnumerable<JsonItem> FetchJsonItems(IOptimizer optimizer) {
+    public IEnumerable<IJsonItem> FetchJsonItems(IOptimizer optimizer) {
       // data container
       Template = JObject.Parse(Constants.Template);
-      JsonItems = new List<JsonItem>();
+      JsonItems = new List<IJsonItem>();
       Optimizer = optimizer;
 
@@ -110 +110 @@
 
     private void AddIItem(IItem item) {
-      JsonItem jsonItem = JsonItemConverter.Extract(item);
+      IJsonItem jsonItem = JsonItemConverter.Extract(item);
       Template[Constants.Metadata][Constants.Optimizer] = item.ItemName;
       PopulateJsonItems(jsonItem);
@@ -116 +116 @@
 
     // serializes ParameterizedItems and saves them in list "JsonItems".
-    private void PopulateJsonItems(JsonItem item) {
-      IEnumerable<JsonItem> tmpParameter = item.Children;
+    private void PopulateJsonItems(IJsonItem item) {
+      IEnumerable<IJsonItem> tmpParameter = item.Children;
       
       if (item.Value != null || item.Range != null || item is ResultItem || item.ActualName != null) {
@@ -130 +130 @@
     }
 
-    private static JObject Serialize(JsonItem item) => 
+    private static JObject Serialize(IJsonItem item) => 
       JObject.FromObject(item, Settings());