Changeset 18050 for branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/JsonTemplateGenerator.cs

Timestamp:

09/08/21 15:53:37 (3 years ago)

Author:

dpiringe

Message:

#3026

• added a new protected virtual property in CheckedItemListView to be able to change the text of the groupBox
• removed event handling in ResultCollectionPostProcessorControl and overwrote the new property GroupBoxText
• added a new section in ExportJsonDialog for result collection processors
• renamed IResultCollectionPostProcessor to IResultCollectionProcessor + all connected classes
• added/changed the workflow of ResultCollectionProcessors in JsonTemplateGenerator and JsonTemplateInstantiator
  • also changed Constants.cs -> added a new section in template ResultCollectionProcessorItems

File:

• branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/JsonTemplateGenerator.cs (modified) (5 diffs)

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

@@ -19 +19 @@
     /// <param name="optimizer">the optimizer object to serialize</param>
     /// <param name="rootItem">Root JsonItem for serialization, considers only active JsonItems for serialization</param>
-    public static void GenerateTemplate(string templatePath, IOptimizer optimizer, IJsonItem rootItem, IEnumerable<IResultCollectionPostProcessor> postProcessors) {
+    public static void GenerateTemplate(string templatePath, IOptimizer optimizer, IJsonItem rootItem, IEnumerable<IResultCollectionProcessor> resultCollectionProcessors) {
       // clear all runs
+      if (optimizer.ExecutionState == ExecutionState.Paused)
+        optimizer.Stop();
       optimizer.Runs.Clear();
 
@@ -32 +34 @@
       JArray parameterItems = new JArray();
       JArray resultItems = new JArray();
-      JArray postProcessorItems = new JArray();
-      // postProcessors.Select(x => new JObject().Add("Name", JToken.Parse(x.GetType().Name))
-      foreach (var proc in postProcessors) {
-        var tmp = new JObject();
-        tmp.Add("Name", proc.GetType().Name);
-        postProcessorItems.Add(tmp);
-      }
-
-      IList<IJsonItem> jsonItems = new List<IJsonItem>();
-     
+      JArray resultCollectionProcessorItems = new JArray();
       string templateName = Path.GetFileName(templatePath);
       string templateDirectory = Path.GetDirectoryName(templatePath);
-
       #endregion
 
-      if(optimizer.ExecutionState == ExecutionState.Paused)
-        optimizer.Stop();
-
-      // recursively filter items with values/ranges/actualNames
-      PopulateJsonItems(rootItem, jsonItems);
+      // filter items with values/ranges/actualNames
+      var jsonItems = rootItem.Where(x => x.Active && !(x is EmptyJsonItem) && !(x is UnsupportedJsonItem));
 
       #region Serialize HL File
@@ -71 +60 @@
       #endregion
 
+      #region ResultCollectionProcessor Serialization
+      foreach (var proc in resultCollectionProcessors) {
+        JArray rcpParameterItems = new JArray();
+        var guid = StorableTypeAttribute.GetStorableTypeAttribute(proc.GetType()).Guid.ToString();
+        var item = JsonItemConverter.Extract(proc);
+
+        var rcpItems = item
+          .Where(x => !(x is EmptyJsonItem) && !(x is UnsupportedJsonItem))
+          .Select(x => x.GenerateJObject());
+
+        foreach (var i in rcpItems)
+          rcpParameterItems.Add(i);
+
+        JObject processorObj = new JObject();
+        processorObj.Add(nameof(IJsonItem.Name), item.Name);
+        processorObj.Add("GUID", guid);
+        processorObj.Add(Constants.Parameters, rcpParameterItems);
+        resultCollectionProcessorItems.Add(processorObj);
+      }
+      #endregion
+
       #region Set Template Data
       template[Constants.Metadata][Constants.TemplateName] = templateName;
@@ -76 +86 @@
       template[Constants.Parameters] = parameterItems;
       template[Constants.Results] = resultItems;
-      template["PostProcessors"] = postProcessorItems;
+      template[Constants.ResultCollectionProcessorItems] = resultCollectionProcessorItems;
       #endregion
 
@@ -83 +93 @@
       #endregion
     }
-
-    #region Helper    
-    private static void PopulateJsonItems(IJsonItem item, IList<IJsonItem> jsonItems) {
-      foreach(var x in item) { // TODO: dieses konstrukt notwendig?
-        if (x.Active && !(x is EmptyJsonItem) && !(x is UnsupportedJsonItem)) {
-          jsonItems.Add(x);
-        }
-      }
-    }
-    #endregion
   }
 }