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

Timestamp:

05/26/20 09:39:14 (4 years ago)

Author:

dpiringe

Message:

#3026:

• added an extra loop to add empty default results in Runner (to prevent not existing results)
• fixed a bug in JsonItemValidValuesControl, now the dropdown should not reset the default value

File:

• branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface.App/Runner.cs (modified) (1 diff)

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

@@ -48 +48 @@
         arr.Add(obj);
         obj.Add("Run", JToken.FromObject(run.ToString()));
+
+        // add empty values for configured results
+        var emptyToken = JToken.FromObject("");
+        foreach (var cr in configuredResults) {
+          obj.Add(cr, emptyToken);
+        }
+
+        // change empty values with calculated values
+        var formatter = new SymbolicDataAnalysisExpressionMATLABFormatter();
         foreach (var res in run.Results) {
-          if (configuredResults.Contains(res.Key)) {
+          if(obj.ContainsKey(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()));
+              var formattedModel = formatter.Format(solution.Model.SymbolicExpressionTree);
+              obj[res.Key] = JToken.FromObject(formattedModel);
+            } else {
+              obj[res.Key] = JToken.FromObject(res.Value.ToString());
+            }
           }
         }