Changeset 18051

Timestamp:

09/09/21 14:44:03 (3 years ago)

Author:

chaider

Message:

#3134 Added RunCollectionPartialDependencePlotView and changed UpdateAllSeriesDataAsync method in PartialDependencePlot to await all updates from the given enumeration

Location:

trunk

Files:

• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4.csproj (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/RunCollectionPartialDependencePlotView.Designer.cs (added)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/RunCollectionPartialDependencePlotView.cs (added)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/Controls/PartialDependencePlot.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionPartialDependencePlotView.cs (modified) (1 diff)

trunk/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4.csproj

@@ -122 +122 @@
       <DependentUpon>InteractiveSymbolicExpressionTreeChart.cs</DependentUpon>
     </Compile>
+    <Compile Include="RunCollectionPartialDependencePlotView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="RunCollectionPartialDependencePlotView.Designer.cs">
+      <DependentUpon>RunCollectionPartialDependencePlotView.cs</DependentUpon>
+    </Compile>
     <Compile Include="SymbolicDataAnalysisModelMathView.cs">
       <SubType>UserControl</SubType>
@@ -276 +282 @@
       <Name>HeuristicLab.Problems.DataAnalysis.Symbolic-3.4</Name>
       <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Views\3.4\HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj">
+      <Project>{3E9E8944-44FF-40BB-A622-3A4A7DD0F198}</Project>
+      <Name>HeuristicLab.Problems.DataAnalysis.Views-3.4</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis\3.4\HeuristicLab.Problems.DataAnalysis-3.4.csproj">

trunk/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);
     }
 

trunk/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionPartialDependencePlotView.cs

@@ -237 +237 @@
 
       RecalculateAndRelayoutCharts();
+    }
+
+    public async Task AddSolution(IRegressionSolution solution) {
+      foreach (var chart in partialDependencePlots.Values) {
+        await chart.AddSolutionAsync(solution);
+      }
     }