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

Timestamp:

01/21/20 17:14:46 (4 years ago)

Author:

dpiringe

Message:

#3026:

• added a new way to setup the targeted result types
• added new ui controls: NumericRangeControl, JsonItemArrayControl, JsonItemDefaultControl
• redesigned export dialog -> now the user can navigate with a tree view
• enhanced JsonItemVM

File:

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

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

@@ -20 +20 @@
     private IOptimizer Optimizer { get; set; }
 
+    
     public string GenerateTemplate(IOptimizer optimizer) {
       // data container
@@ -33 +34 @@
       // which have parameters aswell
       AddIItem(optimizer);
-
       // save the JArray with JsonItems (= IParameterizedItems)
       Template[Constants.Parameters] = JArrayItems;
@@ -45 +45 @@
       Template[Constants.Metadata][Constants.HLFileLocation] = @"C:\Workspace\template.hl";
 
+      JArray ResultItems = new JArray();
+
       JArrayItems = new JArray();
       foreach (var item in items) {
-        JArrayItems.Add(Serialize(item));
+        if (item is ResultItem)
+          ResultItems.Add(Serialize(item));
+        else
+          JArrayItems.Add(Serialize(item));
       }
       Template[Constants.Parameters] = JArrayItems;
+      Template[Constants.ActivatedResults] = ResultItems;
+
+      // serialize template and return string
+      return SingleLineArrayJsonWriter.Serialize(Template);
+    }
+
+    public string GenerateTemplate(JsonItem rootItem, IOptimizer optimizer) {
+      // data container
+      Template = JObject.Parse(Constants.Template);
+      JsonItems = new List<JsonItem>();
+
+      // extract JsonItem, save the name in the metadata section of the 
+      // template and save it an JArray incl. all parameters of the JsonItem, 
+      // which have parameters aswell
+      Template[Constants.Metadata][Constants.Optimizer] = optimizer.Name;
+      PopulateJsonItems(rootItem);
+
+      ProtoBufSerializer serializer = new ProtoBufSerializer();
+      serializer.Serialize(Optimizer, @"C:\Workspace\template.hl");
+      Template[Constants.Metadata][Constants.HLFileLocation] = @"C:\Workspace\template.hl";
+
+      JArray ResultItems = new JArray();
+
+      JArrayItems = new JArray();
+      foreach (var item in JsonItems) {
+        if (item is ResultItem)
+          ResultItems.Add(Serialize(item));
+        else
+          JArrayItems.Add(Serialize(item));
+      }
+      Template[Constants.Parameters] = JArrayItems;
+      Template[Constants.ActivatedResults] = ResultItems;
 
       // serialize template and return string
@@ -81 +118 @@
     private void PopulateJsonItems(JsonItem item) {
       IEnumerable<JsonItem> tmpParameter = item.Children;
-
-      if (item.Value != null || item.Range != null) {
+      
+      if (item.Value != null || item.Range != null || item is ResultItem || item.ActualName != null) {
         JsonItems.Add(item);
       }