Changeset 17464 for branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.App/Runner.cs

Timestamp:

03/02/20 15:53:52 (5 years ago)

Author:

dpiringe

Message:

#3026:

• Runner now uses SymbolicDataAnalysisExpressionMATLABFormatter to save instances of ISymbolicRegressionSolution
• refactored user controls for detail view of json items, now they do not inherit from JsonItemBaseControl -> JsonItemBaseControl uses now an extra control
  • this change was made for fluid repositioning of controls (e.g. when no ActualName is present)

File:

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

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.App/Runner.cs

@@ -8 +8 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.ParallelEngine;
+using HeuristicLab.Problems.DataAnalysis.Symbolic;
+using HeuristicLab.Problems.DataAnalysis.Symbolic.Regression;
 using HeuristicLab.SequentialEngine;
 using Newtonsoft.Json.Linq;
@@ -39 +41 @@
         obj.Add("Run", JToken.FromObject(run.ToString()));
         foreach (var res in run.Results) {
-          if (allowedResultNames.Contains(res.Key))
-            obj.Add(res.Key, JToken.FromObject(res.Value.ToString()));
+          if (allowedResultNames.Contains(res.Key)) {
+            if (res.Value is ISymbolicRegressionSolution solution) {
+              var formatter = new SymbolicDataAnalysisExpressionMATLABFormatter();
+              var x = formatter.Format(solution.Model.SymbolicExpressionTree);
+              obj.Add(res.Key, JToken.FromObject(x));
+            } else
+              obj.Add(res.Key, JToken.FromObject(res.Value.ToString()));
+          }
         }
       }