Changeset 13722 for branches/PerformanceComparison/HeuristicLab.Analysis.Views/3.3

Timestamp:

03/23/16 22:51:27 (8 years ago)

Author:

abeham

Message:

#2457:

• Renamed remaining files from ExpertSystem to KnowledgeCenter
• Added ability to scatter plot to display a regression line
• Allowed to execute multiple instances at once and displaying either only final result or tracking result
• Split runs in seeded runs and instance runs

Location:

branches/PerformanceComparison/HeuristicLab.Analysis.Views/3.3

Files:

• HeuristicLab.Analysis.Views-3.3.csproj (modified) (2 diffs)
• Plugin.cs.frame (modified) (1 diff)
• ScatterPlotDataRowVisualPropertiesControl.Designer.cs (modified) (4 diffs)
• ScatterPlotDataRowVisualPropertiesControl.cs (modified) (6 diffs)
• ScatterPlotDataRowVisualPropertiesControl.resx (added)
• ScatterPlotView.cs (modified) (4 diffs)

branches/PerformanceComparison/HeuristicLab.Analysis.Views/3.3/HeuristicLab.Analysis.Views-3.3.csproj

@@ -105 +105 @@
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="ALGLIB-3.7.0, Version=3.7.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\trunk\sources\bin\ALGLIB-3.7.0.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -309 +314 @@
     <EmbeddedResource Include="HeatMapView.resx">
       <DependentUpon>HeatMapView.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="ScatterPlotDataRowVisualPropertiesControl.resx">
+      <DependentUpon>ScatterPlotDataRowVisualPropertiesControl.cs</DependentUpon>
     </EmbeddedResource>
   </ItemGroup>

branches/PerformanceComparison/HeuristicLab.Analysis.Views/3.3/Plugin.cs.frame

@@ -28 +28 @@
   [Plugin("HeuristicLab.Analysis.Views", "3.3.13.$WCREV$")]
   [PluginFile("HeuristicLab.Analysis.Views-3.3.dll", PluginFileType.Assembly)]
+  [PluginDependency("HeuristicLab.ALGLIB", "3.7.0")]
   [PluginDependency("HeuristicLab.Analysis", "3.3")]
   [PluginDependency("HeuristicLab.Collections", "3.3")]

branches/PerformanceComparison/HeuristicLab.Analysis.Views/3.3/ScatterPlotDataRowVisualPropertiesControl.Designer.cs

@@ -56 +56 @@
       this.label9 = new System.Windows.Forms.Label();
       this.label7 = new System.Windows.Forms.Label();
+      this.label4 = new System.Windows.Forms.Label();
+      this.regressionLineCheckBox = new System.Windows.Forms.CheckBox();
       ((System.ComponentModel.ISupportInitialize)(this.pointSizeNumericUpDown)).BeginInit();
       this.SuspendLayout();
@@ -171 +173 @@
       this.label7.Text = "&Visible in Legend:";
       // 
+      // label4
+      // 
+      this.label4.AutoSize = true;
+      this.label4.Location = new System.Drawing.Point(3, 136);
+      this.label4.Name = "label4";
+      this.label4.Size = new System.Drawing.Size(86, 13);
+      this.label4.TabIndex = 2;
+      this.label4.Text = "&Regression Line:";
+      // 
+      // regressionLineCheckBox
+      // 
+      this.regressionLineCheckBox.AutoSize = true;
+      this.regressionLineCheckBox.CheckAlign = System.Drawing.ContentAlignment.MiddleRight;
+      this.regressionLineCheckBox.Location = new System.Drawing.Point(99, 136);
+      this.regressionLineCheckBox.Name = "regressionLineCheckBox";
+      this.regressionLineCheckBox.Size = new System.Drawing.Size(15, 14);
+      this.regressionLineCheckBox.TabIndex = 3;
+      this.regressionLineCheckBox.UseVisualStyleBackColor = true;
+      this.regressionLineCheckBox.CheckedChanged += new System.EventHandler(this.regressionLineCheckBox_CheckedChanged);
+      // 
       // ScatterPlotDataRowVisualPropertiesControl
       // 
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
       this.Controls.Add(this.pointSizeNumericUpDown);
+      this.Controls.Add(this.regressionLineCheckBox);
       this.Controls.Add(this.isVisibleInLegendCheckBox);
       this.Controls.Add(this.label9);
       this.Controls.Add(this.label3);
+      this.Controls.Add(this.label4);
       this.Controls.Add(this.pointStyleComboBox);
       this.Controls.Add(this.label7);
@@ -185 +209 @@
       this.Controls.Add(this.colorButton);
       this.Name = "ScatterPlotDataRowVisualPropertiesControl";
-      this.Size = new System.Drawing.Size(342, 135);
+      this.Size = new System.Drawing.Size(342, 157);
       ((System.ComponentModel.ISupportInitialize)(this.pointSizeNumericUpDown)).EndInit();
       this.ResumeLayout(false);
@@ -205 +229 @@
     private System.Windows.Forms.Label label9;
     private System.Windows.Forms.Label label3;
+    private System.Windows.Forms.Label label4;
+    private System.Windows.Forms.CheckBox regressionLineCheckBox;
   }
 }

branches/PerformanceComparison/HeuristicLab.Analysis.Views/3.3/ScatterPlotDataRowVisualPropertiesControl.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -20 +20 @@
 #endregion
 
+using HeuristicLab.MainForm;
 using System;
 using System.Drawing;
 using System.Windows.Forms;
-using HeuristicLab.MainForm;
-using HeuristicLab.MainForm.WindowsForms;
 
 namespace HeuristicLab.Analysis.Views {
@@ -57 +56 @@
           pointSizeNumericUpDown.Value = 1;
           displayNameTextBox.Text = String.Empty;
+          regressionLineCheckBox.Checked = false;
         } else {
           displayNameTextBox.Text = Content.DisplayName;
@@ -69 +69 @@
           pointSizeNumericUpDown.Value = Content.PointSize;
           isVisibleInLegendCheckBox.Checked = Content.IsVisibleInLegend;
+          regressionLineCheckBox.Checked = Content.ShowRegressionLine;
         }
       }
@@ -82 +83 @@
       pointSizeNumericUpDown.Enabled = Content != null;
       displayNameTextBox.Enabled = Content != null;
+      regressionLineCheckBox.Enabled = Content != null;
     }
 
@@ -121 +123 @@
       }
     }
+
+    private void regressionLineCheckBox_CheckedChanged(object sender, EventArgs e) {
+      if (!SuppressEvents && Content != null) {
+        Content.ShowRegressionLine = regressionLineCheckBox.Checked;
+      }
+    }
     #endregion
   }

branches/PerformanceComparison/HeuristicLab.Analysis.Views/3.3/ScatterPlotView.cs

@@ -20 +20 @@
 #endregion
 
+using HeuristicLab.Collections;
+using HeuristicLab.Common;
+using HeuristicLab.Core.Views;
+using HeuristicLab.MainForm;
 using System;
 using System.Collections.Generic;
@@ -26 +30 @@
 using System.Windows.Forms;
 using System.Windows.Forms.DataVisualization.Charting;
-using HeuristicLab.Collections;
-using HeuristicLab.Common;
-using HeuristicLab.Core.Views;
-using HeuristicLab.MainForm;
 
 namespace HeuristicLab.Analysis.Views {
@@ -141 +141 @@
         DeregisterScatterPlotDataRowEvents(row);
         Series series = chart.Series[row.Name];
+        if (chart.Series.IsUniqueName(series.Name + ".lr"))
+          chart.Series.Remove(chart.Series[series.Name + ".lr"]);
         chart.Series.Remove(series);
         if (invisibleSeries.Contains(series))
@@ -460 +462 @@
 
     private void FillSeriesWithRowValues(Series series, ScatterPlotDataRow row) {
+      if (row.VisualProperties.ShowRegressionLine) {
+        var xs = row.Points.Select(p => p.X).ToArray();
+        var xsMin = xs.Min();
+        var xsMax = xs.Max();
+        var ys = row.Points.Select(p => p.Y).ToArray();
+        var corr = alglib.pearsoncorr2(xs, ys);
+        var slope = corr * ys.StandardDeviation() / xs.StandardDeviation();
+        if (!double.IsNaN(slope) && !double.IsInfinity(slope)) {
+          var off = ys.Average() - slope * xs.Average();
+
+          Series lrSeries;
+          if (chart.Series.IsUniqueName(series.Name + ".lr")) {
+            lrSeries = new Series(series.Name + ".lr") {IsVisibleInLegend = false, ChartType = SeriesChartType.FastLine};
+            chart.Series.Add(lrSeries);
+          } else lrSeries = chart.Series[series.Name + ".lr"];
+          lrSeries.Points.Clear();
+          lrSeries.Points.AddXY(xsMin, slope * xsMin + off);
+          lrSeries.Points.AddXY(xsMax, slope * xsMax + off);
+        }
+      } else if (!chart.Series.IsUniqueName(series.Name + ".lr"))
+        chart.Series.Remove(chart.Series[series.Name + ".lr"]);
+
       for (int i = 0; i < row.Points.Count; i++) {
         var value = row.Points[i];