Changeset 18026

Timestamp:

07/20/21 17:39:48 (3 years ago)

Author:

dpiringe

Message:

#3026

• fixed a bug in Runner: the zip-method created wrong pairs (because the lists are unordered)
• fixed a bug in SymbolicRegressionSolutionFormatterBase: the method now checks the target type as well

Location:

branches/3026_IntegrationIntoSymSpace

Files:

• HeuristicLab.JsonInterface.App/Runner.cs (modified) (2 diffs)
• HeuristicLab.JsonInterface/JsonTemplateInstantiator.cs (modified) (1 diff)
• HeuristicLab.JsonInterface/ResultFormatters/SymbolicRegressionSolutionFormatterBase.cs (modified) (1 diff)

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

@@ -5 +5 @@
 using System.Threading;
 using System.Threading.Tasks;
+using HeuristicLab.Core;
 using HeuristicLab.Optimization;
 using Newtonsoft.Json.Linq;
@@ -53 +54 @@
 
         // zip and filter the results with the ResultJsonItems
-        var filteredResults = configuredResultItems.Zip(
-          run.Results.Where(x => configuredResultItems.Any(y => y.Name == x.Key)), 
-          (x, y) => new { Item = x, Value = y.Value });
+        var filteredResults = new List<Tuple<IResultJsonItem, IItem>>();
+        foreach(var resultItem in configuredResultItems) {
+          foreach(var result in run.Results) {
+            if(resultItem.Name == result.Key) {
+              filteredResults.Add(Tuple.Create(resultItem, result.Value));
+            }
+          }
+        }
 
         // add results to the JObject
         foreach(var result in filteredResults) {
-          var formatter = GetResultFormatter(result.Item.ResultFormatterType);
-          obj.Add(result.Item.Name, formatter.Format(result.Value));
+          var formatter = GetResultFormatter(result.Item1.ResultFormatterType);
+          obj.Add(result.Item1.Name, formatter.Format(result.Item2));
         }
       }

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

@@ -108 +108 @@
       foreach (JObject obj in Config) {
         // build item from config object
-        string path = obj.Property("Path").Value.ToString();
+        string path = obj.Property("Path").Value.ToString(); // TODO: catch exception if path is not available
         // override default value
         if (Objects.TryGetValue(path, out IJsonItem param)) {

branches/3026_IntegrationIntoSymSpace/HeuristicLab.JsonInterface/ResultFormatters/SymbolicRegressionSolutionFormatterBase.cs

@@ -10 +10 @@
     public override bool CanFormatType(Type t) {
       var interfaces = t.GetInterfaces();
-      return t.GetInterfaces().Any(x => x == typeof(ISymbolicRegressionSolution));
+      var symRegSolutionType = typeof(ISymbolicRegressionSolution);
+      return t == symRegSolutionType || interfaces.Any(x => x == symRegSolutionType);
     }
 
     protected abstract ISymbolicExpressionTreeStringFormatter SymbolicExpressionTreeStringFormatter { get; }
 
-    public override string Format(object o) => SymbolicExpressionTreeStringFormatter.Format((ISymbolicExpressionTree)((ISymbolicRegressionSolution)o).Model.SymbolicExpressionTree);
+    public override string Format(object o) => SymbolicExpressionTreeStringFormatter.Format(((ISymbolicRegressionSolution)o).Model.SymbolicExpressionTree);
   }
 }