Changeset 13840 for branches/HeuristicLab.RegressionSolutionGradientView/HeuristicLab.Problems.DataAnalysis.Views

Timestamp:

05/10/16 12:38:08 (8 years ago)

Author:

pfleck

Message:

#2597 Implemented cancellation of chart update when new update is called during calculation.

Location:

branches/HeuristicLab.RegressionSolutionGradientView/HeuristicLab.Problems.DataAnalysis.Views/3.4

Files:

• GradientChart.Designer.cs (modified) (3 diffs)
• GradientChart.cs (modified) (15 diffs)
• RegressionSolutionGradientView.cs (modified) (2 diffs)
• RegressionSolutionTargetResponseGradientView.cs (modified) (3 diffs)

branches/HeuristicLab.RegressionSolutionGradientView/HeuristicLab.Problems.DataAnalysis.Views/3.4/GradientChart.Designer.cs

@@ -31 +31 @@
       System.Windows.Forms.DataVisualization.Charting.Legend legend1 = new System.Windows.Forms.DataVisualization.Charting.Legend();
       this.chart = new HeuristicLab.Visualization.ChartControlsExtensions.EnhancedChart();
+      this.statusLabel = new System.Windows.Forms.Label();
       ((System.ComponentModel.ISupportInitialize)(this.chart)).BeginInit();
       this.SuspendLayout();
@@ -70 +71 @@
       this.chart.MouseMove += new System.Windows.Forms.MouseEventHandler(this.chart_MouseMove);
       // 
+      // statusLabel
+      // 
+      this.statusLabel.BackColor = System.Drawing.Color.White;
+      this.statusLabel.Image = HeuristicLab.Common.Resources.VSImageLibrary.Timer;
+      this.statusLabel.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
+      this.statusLabel.Location = new System.Drawing.Point(3, 3);
+      this.statusLabel.Margin = new System.Windows.Forms.Padding(0);
+      this.statusLabel.Name = "statusLabel";
+      this.statusLabel.Size = new System.Drawing.Size(17, 17);
+      this.statusLabel.TabIndex = 1;
+      this.statusLabel.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+      this.statusLabel.Visible = false;
+      // 
       // GradientChart
       // 
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+      this.Controls.Add(this.statusLabel);
       this.Controls.Add(this.chart);
       this.Name = "GradientChart";
@@ -85 +100 @@
 
     private HeuristicLab.Visualization.ChartControlsExtensions.EnhancedChart chart;
+    private System.Windows.Forms.Label statusLabel;
   }
 }

branches/HeuristicLab.RegressionSolutionGradientView/HeuristicLab.Problems.DataAnalysis.Views/3.4/GradientChart.cs

@@ -25 +25 @@
 using System.Globalization;
 using System.Linq;
+using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Forms;
@@ -37 +38 @@
     private ModifiableDataset internalDataset; // holds the x values for each point drawn
 
+    private CancellationTokenSource cancelCurrentRefresh;
+
     public bool ShowLegend {
       get { return chart.Legends[0].Enabled; }
@@ -57 +60 @@
     public int XAxisTicks {
       get { return xAxisTicks; }
-      set { if (xAxisTicks != value) { xAxisTicks = value; UpdateChartAsync(); } }
+      set { if (xAxisTicks != value) { xAxisTicks = value; UpdateChart(); } }
     }
     private int yAxisTicks = 5;
     public int YXAxisTicks {
       get { return yAxisTicks; }
-      set { if (yAxisTicks != value) { yAxisTicks = value; UpdateChartAsync(); } }
+      set { if (yAxisTicks != value) { yAxisTicks = value; UpdateChart(); } }
     }
 
@@ -68 +71 @@
     public double TrainingMin {
       get { return trainingMin; }
-      set { if (!value.IsAlmost(trainingMin)) { trainingMin = value; UpdateChartAsync(); } }
+      set { if (!value.IsAlmost(trainingMin)) { trainingMin = value; UpdateChart(); } }
     }
     private double trainingMax = double.MaxValue;
     public double TrainingMax {
       get { return trainingMax; }
-      set { if (!value.IsAlmost(trainingMax)) { trainingMax = value; UpdateChartAsync(); } }
+      set { if (!value.IsAlmost(trainingMax)) { trainingMax = value; UpdateChart(); } }
     }
 
@@ -79 +82 @@
     public int DrawingSteps {
       get { return drawingSteps; }
-      set { if (value != drawingSteps) { drawingSteps = value; UpdateChartAsync(); } }
+      set { if (value != drawingSteps) { drawingSteps = value; UpdateChart(); } }
     }
 
@@ -92 +95 @@
         freeVariable = value;
         RecalculateInternalDataset();
-        UpdateChartAsync();
+        UpdateChart();
       }
     }
@@ -117 +120 @@
       chart.ChartAreas[0].AxisY.ScaleView.Zoomable = true;
       chart.ChartAreas[0].CursorY.Interval = 0;
+
+      Disposed +=GradientChart_Disposed;
+    }
+
+    private void GradientChart_Disposed(object sender, EventArgs e) {
+      if (cancelCurrentRefresh != null) {
+        if (cancelCurrentRefresh.IsCancellationRequested)
+          cancelCurrentRefresh.Cancel();
+        cancelCurrentRefresh.Dispose();
+      }
     }
 
@@ -175 +188 @@
     }
 
-    public async Task UpdateChartAsync() {
+    public async void UpdateChart() {
       // throw exceptions?
       if (sharedFixedVariables == null || solutions == null || !solutions.Any())
@@ -181 +194 @@
       if (trainingMin.IsAlmost(trainingMax) || trainingMin > trainingMax || drawingSteps == 0)
         return;
+      if (IsDisposed)
+        return;
+
+      statusLabel.Visible = true;
+
+      if (cancelCurrentRefresh != null && !cancelCurrentRefresh.IsCancellationRequested)
+        cancelCurrentRefresh.Cancel();
+      cancelCurrentRefresh = new CancellationTokenSource();
 
       // Set cursor
@@ -194 +215 @@
       axis.Interval = axisInterval;
 
+      var cancellationToken = cancelCurrentRefresh.Token;
       // Create series <mean, conf. interval>
       var seriesDict = new Dictionary<Series, Series>();
-      for (int i = 0; i < solutions.Count; ++i) {
+      for (int i = 0; i < solutions.Count; i++) {
         var solution = solutions[i];
-        var series = await CreateSeriesAsync(solution);
-        series.Item1.Tag = i; // for sorting
-        var meanSeries = series.Item1;
-        var confidenceIntervalSeries = series.Item2;
-        meanSeries.Name = solution.ProblemData.TargetVariable + " " + i;
-        seriesDict.Add(meanSeries, confidenceIntervalSeries);
-        if (confidenceIntervalSeries != null)
-          confidenceIntervalSeries.Name = "95% Conf. Interval " + meanSeries.Name;
+        try {
+          var series = await CreateSeriesAsync(solution, cancellationToken);
+          if (cancellationToken.IsCancellationRequested)
+            return;
+          series.Item1.Tag = i; // for sorting
+          var meanSeries = series.Item1;
+          var confidenceIntervalSeries = series.Item2;
+          meanSeries.Name = solution.ProblemData.TargetVariable + " " + i;
+          seriesDict.Add(meanSeries, confidenceIntervalSeries);
+          if (confidenceIntervalSeries != null)
+            confidenceIntervalSeries.Name = "95% Conf. Interval " + meanSeries.Name;
+        }
+        catch (TaskCanceledException) {
+          return;
+        }
       }
 
@@ -229 +258 @@
 
 
-      // calculate Y-axis interval
+      ////calculate Y-axis interval
       //double ymin = 0, ymax = 0;
       //foreach (var vs in chart.Series.SelectMany(series => series.Points.Select(s => s.YValues))) {
@@ -249 +278 @@
 
       UpdateStripLines();
-    }
-
-    private Task<Tuple<Series, Series>> CreateSeriesAsync(IRegressionSolution solution) {
+
+      statusLabel.Visible = false;
+    }
+
+    private Task<Tuple<Series, Series>> CreateSeriesAsync(IRegressionSolution solution, CancellationToken cancellationToken) {
       return Task.Run(() => {
         var xvalues = internalDataset.GetDoubleValues(FreeVariable).ToList();
@@ -270 +301 @@
           confidenceIntervalSeries.Points.DataBindXY(xvalues, lower, upper);
         }
-
         return Tuple.Create(series, confidenceIntervalSeries);
-      });
+      }, cancellationToken);
     }
 
@@ -281 +311 @@
       solutions.Add(solution);
       RecalculateTrainingLimits();
-      UpdateChartAsync();
+      UpdateChart();
     }
     public void RemoveSolution(IRegressionSolution solution) {
       if (!solutions.Remove(solution)) return;
       RecalculateTrainingLimits();
-      UpdateChartAsync();
+      UpdateChart();
     }
 
@@ -324 +354 @@
 
     private void chart_AnnotationPositionChanged(object sender, EventArgs e) {
-      var annotation = VerticalLineAnnotation;
-      var x = annotation.X;
-      sharedFixedVariables.SetVariableValue(x, FreeVariable, 0);
-
-      chart.ChartAreas[0].AxisX.Title = FreeVariable + " : " + x.ToString("N3", CultureInfo.CurrentCulture);
-      chart.Update();
-
-      OnVariableValueChanged(this, EventArgs.Empty);
+      //var annotation = VerticalLineAnnotation;
+      //var x = annotation.X;
+      //sharedFixedVariables.SetVariableValue(x, FreeVariable, 0);
+
+      //chart.ChartAreas[0].AxisX.Title = FreeVariable + " : " + x.ToString("N3", CultureInfo.CurrentCulture);
+      //chart.Update();
+
+      //OnVariableValueChanged(this, EventArgs.Empty);
     }
 
     private void chart_AnnotationPositionChanging(object sender, AnnotationPositionChangingEventArgs e) {
-      //var step = (trainingMax - trainingMin) / drawingSteps;
-      //e.NewLocationX = step * (long)Math.Round(e.NewLocationX / step);
-      //var axisX = chart.ChartAreas[0].AxisX;
-      //if (e.NewLocationX > axisX.Maximum)
-      //  e.NewLocationX = axisX.Maximum;
-      //if (e.NewLocationX < axisX.Minimum)
-      //  e.NewLocationX = axisX.Minimum;
+      var step = (trainingMax - trainingMin) / drawingSteps;
+      e.NewLocationX = step * (long)Math.Round(e.NewLocationX / step);
+      var axisX = chart.ChartAreas[0].AxisX;
+      if (e.NewLocationX > axisX.Maximum)
+        e.NewLocationX = axisX.Maximum;
+      if (e.NewLocationX < axisX.Minimum)
+        e.NewLocationX = axisX.Minimum;
 
       var annotation = VerticalLineAnnotation;

branches/HeuristicLab.RegressionSolutionGradientView/HeuristicLab.Problems.DataAnalysis.Views/3.4/RegressionSolutionGradientView.cs

@@ -87 +87 @@
       sharedFixedVariables = new ModifiableDataset(variableNames, newTrackbars.Select(tb => new List<double>(1) { (double)tb.Value }));
       gradientChart.Configure(new[] { Content }, sharedFixedVariables, variableNames.First(), DrawingSteps);
-      gradientChart.UpdateChartAsync();
+      gradientChart.UpdateChart();
 
       // Add to table and observable lists     
@@ -149 +149 @@
     }
 
-    private async void trackbar_ValueChanged(object sender, EventArgs e) {
+    private void trackbar_ValueChanged(object sender, EventArgs e) {
       var trackBar = sender as DensityTrackbar;
       if (trackBar == null) return;
       sharedFixedVariables.SetVariableValue((double)trackBar.Value, variableNames[trackbars.IndexOf(trackBar)], 0);
-      await gradientChart.UpdateChartAsync();
+      gradientChart.UpdateChart();
     }
 

branches/HeuristicLab.RegressionSolutionGradientView/HeuristicLab.Problems.DataAnalysis.Views/3.4/RegressionSolutionTargetResponseGradientView.cs

@@ -73 +73 @@
           ShowYAxisLabel = true,
         };
-        gradientChart.VariableValueChanged += async (o, e) => {
+        gradientChart.VariableValueChanged += (o, e) => {
           foreach (var chart in gradientChartTableLayout.Controls.Cast<GradientChart>()) {
             if (chart == (GradientChart)o) continue;
-            await chart.UpdateChartAsync();
+            chart.UpdateChart();
           }
         };
@@ -99 +99 @@
     }
 
-    private async void variableListView_ItemChecked(object sender, ItemCheckedEventArgs e) {
+    private void variableListView_ItemChecked(object sender, ItemCheckedEventArgs e) {
       if (charts == null) return;
       var item = e.Item;
@@ -111 +111 @@
       if (item.Checked) {
         tl.Controls.Add(chart);
-        await chart.UpdateChartAsync();
+        chart.UpdateChart();
       } else {
         tl.Controls.Remove(chart);