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

Timestamp:

02/25/20 17:18:00 (4 years ago)

Author:

dpiringe

Message:

#3026:

• renamed ResultItem to ResultJsonItem
• implemented RegressionProblemDataConverter
• added support for "named matrices" (named = rows and columns have names) -> INamedMatrixJsonItem incl. base classes and views
• added a bool property Active in IJsonItem -> marks items, which should be written into the template

File:

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

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

@@ -41 +41 @@
       // filter result items
       foreach (var item in jsonItems) {
-        if (item is ResultItem)
+        if (item is ResultJsonItem)
           resultItems.Add(Serialize(item));
         else
@@ -60 +60 @@
     // serializes ParameterizedItems and saves them in list "JsonItems".
     private void PopulateJsonItems(IJsonItem item, IList<IJsonItem> jsonItems) {
-      IEnumerable<IJsonItem> tmpParameter = item.Children;
+      IEnumerable<IJsonItem> children = item.Children;
       
-      if (item.Value != null || item.Range != null || item is ResultItem || item.ActualName != null) {
+      if (item.Active && (item.Value != null || item.Range != null || item is ResultJsonItem || item.ActualName != null)) {
         jsonItems.Add(item);
       }
 
-      if (tmpParameter != null) {
-        foreach (var p in tmpParameter) {
+      if (children != null) {
+        foreach (var p in children) {
           PopulateJsonItems(p, jsonItems);
         }