Changeset 18086 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.DataAnalysis.Views/3.4/Controls/PartialDependencePlot.cs

Timestamp:

11/19/21 16:07:45 (2 years ago)

Author:

mkommend

Message:

#2521: Merged trunk changes into branch.

File:

• branches/2521_ProblemRefactoring/HeuristicLab.Problems.DataAnalysis.Views/3.4/Controls/PartialDependencePlot.cs (modified) (4 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Problems.DataAnalysis.Views/3.4/Controls/PartialDependencePlot.cs

@@ -453 +453 @@
     }
 
-    private async Task<DoubleLimit> UpdateAllSeriesDataAsync(CancellationToken cancellationToken) {
+    private Task<DoubleLimit> UpdateAllSeriesDataAsync(CancellationToken cancellationToken) {
       var updateTasks = solutions.Select(solution => UpdateSeriesDataAsync(solution, cancellationToken));
 
-      double min = double.MaxValue, max = double.MinValue;
-      foreach (var update in updateTasks) {
-        var limit = await update;
-        if (limit.Lower < min) min = limit.Lower;
-        if (limit.Upper > max) max = limit.Upper;
-      }
-
-      return new DoubleLimit(min, max);
+      return Task.Run(() => {
+        double min = double.MaxValue, max = double.MinValue;
+        foreach (var update in updateTasks) {
+          var limit = update.Result;
+          if (limit.Lower < min) min = limit.Lower;
+          if (limit.Upper > max) max = limit.Upper;
+        }
+
+        return new DoubleLimit(min, max);
+      }, cancellationToken);
     }
 
@@ -530 +532 @@
 
     public async Task AddSolutionAsync(IRegressionSolution solution) {
+      if (solutions.Contains(solution))
+        return;
       if (!SolutionsCompatible(solutions.Concat(new[] { solution })))
         throw new ArgumentException("The solution is not compatible with the problem data.");
-      if (solutions.Contains(solution))
-        return;
 
       solutions.Add(solution);
@@ -568 +570 @@
       var refSolution = solutions.First();
       var refSolVars = refSolution.ProblemData.Dataset.VariableNames;
+      var refFactorVars = refSolution.ProblemData.Dataset.StringVariables;
+      var distinctVals = refFactorVars.ToDictionary(fv => fv, fv => refSolution.ProblemData.Dataset.GetStringValues(fv).Distinct().ToArray());
+
       foreach (var solution in solutions.Skip(1)) {
-        var variables1 = solution.ProblemData.Dataset.VariableNames;
-        if (!variables1.All(refSolVars.Contains))
+        var variables1 = new HashSet<string>(solution.ProblemData.Dataset.VariableNames);
+        if (!variables1.IsSubsetOf(refSolVars))
           return false;
 
-        foreach (var factorVar in variables1.Where(solution.ProblemData.Dataset.VariableHasType<string>)) {
-          var distinctVals = refSolution.ProblemData.Dataset.GetStringValues(factorVar).Distinct();
-          if (solution.ProblemData.Dataset.GetStringValues(factorVar).Any(val => !distinctVals.Contains(val))) return false;
+        foreach (var factorVar in solution.ProblemData.Dataset.StringVariables) {
+          var refValues = distinctVals[factorVar];
+          var values = new HashSet<string>(solution.ProblemData.Dataset.GetStringValues(factorVar));
+
+          if (!values.IsSubsetOf(refValues))
+            return false;
         }
       }
@@ -646 +654 @@
 
     private void sharedFixedVariables_Reset(object sender, EventArgs e) {
+      RecalculateInternalDataset();
       var newValue = sharedFixedVariables.GetDoubleValue(FreeVariable, 0);
       VerticalLineAnnotation.X = newValue;
-      UpdateCursor(); // triggers update of InternalDataset
+      UpdateCursor();
     }