Changeset 13824 for branches/HeuristicLab.RegressionSolutionGradientView/HeuristicLab.Problems.DataAnalysis.Views/3.4

Timestamp:

05/03/16 12:25:30 (8 years ago)

Author:

pfleck

Message:

#2597:

• Added new Model property in IConfidenceBoundRegressionSolution.
• Added ConfidenceBoundRegressionSolution base and methods to it from GaussianProcessRegressionSolution.
• Replaced RegressionSolutionGradientView with GaussianProcessRegressionSolutionInteractiveRangeEstimatorView. Also moved DensityTrackbar to Problems.DataAnalysis.Views Plugin.
• DensityTrackbar initial position is now where the density is highest.

Location:

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

Files:

• DensityTrackbar.Designer.cs (moved) (moved from branches/HeuristicLab.RegressionSolutionGradientView/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/DensityTrackbar.Designer.cs) (6 diffs)
• DensityTrackbar.cs (moved) (moved from branches/HeuristicLab.RegressionSolutionGradientView/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/DensityTrackbar.cs) (3 diffs)
• HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj (modified) (5 diffs)
• RegressionSolutionGradientView.Designer.cs (moved) (moved from branches/HeuristicLab.RegressionSolutionGradientView/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/GaussianProcessRegressionSolutionInteractiveRangeEstimatorView.Designer.cs) (2 diffs)
• RegressionSolutionGradientView.cs (moved) (moved from branches/HeuristicLab.RegressionSolutionGradientView/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/GaussianProcessRegressionSolutionInteractiveRangeEstimatorView.cs) (2 diffs)

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

@@ -50 +50 @@
       this.radioButton = new System.Windows.Forms.RadioButton();
       this.trackBar = new System.Windows.Forms.TrackBar();
-      this.doubleLimitView = new HeuristicLab.Problems.DataAnalysis.Views.DoubleLimitView();
       this.chart = new HeuristicLab.Visualization.ChartControlsExtensions.EnhancedChart();
       this.textBox = new System.Windows.Forms.TextBox();
       this.groupBox = new System.Windows.Forms.GroupBox();
+      this.doubleLimitView = new HeuristicLab.Problems.DataAnalysis.Views.DoubleLimitView();
       ((System.ComponentModel.ISupportInitialize)(this.trackBar)).BeginInit();
       ((System.ComponentModel.ISupportInitialize)(this.chart)).BeginInit();
@@ -80 +80 @@
       this.trackBar.Name = "trackBar";
       this.trackBar.RightToLeft = System.Windows.Forms.RightToLeft.No;
-      this.trackBar.Size = new System.Drawing.Size(193, 45);
+      this.trackBar.Size = new System.Drawing.Size(371, 45);
       this.trackBar.TabIndex = 1;
       this.trackBar.TickFrequency = 100;
       this.trackBar.Value = 500;
       this.trackBar.ValueChanged += new System.EventHandler(this.trackBar_ValueChanged);
-      // 
-      // doubleLimitView
-      // 
-      this.doubleLimitView.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-      this.doubleLimitView.Caption = "DoubleLimit View";
-      this.doubleLimitView.Content = null;
-      this.doubleLimitView.Location = new System.Drawing.Point(343, 10);
-      this.doubleLimitView.Name = "doubleLimitView";
-      this.doubleLimitView.ReadOnly = false;
-      this.doubleLimitView.Size = new System.Drawing.Size(151, 47);
-      this.doubleLimitView.TabIndex = 2;
       // 
       // chart
@@ -116 +105 @@
       chartArea1.Position.Width = 100F;
       this.chart.ChartAreas.Add(chartArea1);
-      this.chart.Location = new System.Drawing.Point(157, 35);
+      this.chart.Location = new System.Drawing.Point(156, 35);
       this.chart.Name = "chart";
       series1.ChartArea = "ChartArea1";
@@ -122 +111 @@
       series1.Name = "Default";
       this.chart.Series.Add(series1);
-      this.chart.Size = new System.Drawing.Size(168, 20);
+      this.chart.Size = new System.Drawing.Size(345, 20);
       this.chart.TabIndex = 3;
       this.chart.Text = "Density";
@@ -144 +133 @@
       this.groupBox.Location = new System.Drawing.Point(0, 0);
       this.groupBox.Name = "groupBox";
-      this.groupBox.Size = new System.Drawing.Size(500, 62);
+      this.groupBox.Size = new System.Drawing.Size(678, 62);
       this.groupBox.TabIndex = 5;
       this.groupBox.TabStop = false;
+      // 
+      // doubleLimitView
+      // 
+      this.doubleLimitView.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+      this.doubleLimitView.Caption = "DoubleLimit View";
+      this.doubleLimitView.Content = null;
+      this.doubleLimitView.Location = new System.Drawing.Point(521, 10);
+      this.doubleLimitView.Name = "doubleLimitView";
+      this.doubleLimitView.ReadOnly = false;
+      this.doubleLimitView.Size = new System.Drawing.Size(151, 47);
+      this.doubleLimitView.TabIndex = 2;
       // 
       // DensityTrackbar
@@ -153 +153 @@
       this.Controls.Add(this.groupBox);
       this.Name = "DensityTrackbar";
-      this.Size = new System.Drawing.Size(500, 62);
+      this.Size = new System.Drawing.Size(678, 62);
       ((System.ComponentModel.ISupportInitialize)(this.trackBar)).EndInit();
       ((System.ComponentModel.ISupportInitialize)(this.chart)).EndInit();

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

@@ -26 +26 @@
 using System.Windows.Forms;
 using System.Windows.Forms.DataVisualization.Charting;
+using HeuristicLab.Common;
 using HeuristicLab.Problems.DataAnalysis;
 
@@ -50 +51 @@
     private IList<double> trainingValues;
 
+    // For VisualStudio Designer
     internal DensityTrackbar() {
       InitializeComponent();
@@ -98 +100 @@
 
       series.Points.DataBindY(buckets);
+
+      // Set trackbar on highest density
+      double highestDensity = buckets.Max();
+      var highestIndices = buckets.Select((v, i) => new { v, i }).Where(x => x.v.IsAlmost(highestDensity)).Select(x => x.i).ToList();
+      trackBar.Value = highestIndices[highestIndices.Count / 2];
     }
 

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

@@ -103 +103 @@
       <Private>False</Private>
     </Reference>
-    <Reference Include="HeuristicLab.Algorithms.DataAnalysis-3.4">
-      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Algorithms.DataAnalysis-3.4.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
     <Reference Include="HeuristicLab.Analysis-3.3">
       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Analysis-3.3.dll</HintPath>
@@ -250 +246 @@
       <DependentUpon>ClusteringSolutionVisualizationView.cs</DependentUpon>
     </Compile>
+    <Compile Include="DensityTrackbar.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="DensityTrackbar.Designer.cs">
+      <DependentUpon>DensityTrackbar.cs</DependentUpon>
+    </Compile>
     <Compile Include="FeatureCorrelation\AbstractFeatureCorrelationView.cs">
       <SubType>UserControl</SubType>
@@ -268 +270 @@
     <Compile Include="FeatureCorrelation\FeatureCorrelationView.Designer.cs">
       <DependentUpon>FeatureCorrelationView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="RegressionSolutionGradientView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="RegressionSolutionGradientView.Designer.cs">
+      <DependentUpon>RegressionSolutionGradientView.cs</DependentUpon>
     </Compile>
     <Compile Include="Interfaces\IDataPreprocessorStarter.cs" />
@@ -283 +291 @@
     <Compile Include="ProblemDataView.Designer.cs">
       <DependentUpon>ProblemDataView.cs</DependentUpon>
-    </Compile>
-    <Compile Include="RegressionSolutionGradientView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="RegressionSolutionGradientView.Designer.cs">
-      <DependentUpon>RegressionSolutionGradientView.cs</DependentUpon>
     </Compile>
     <Compile Include="RegressionSolutionTargetResponseGradientView.cs">
@@ -500 +502 @@
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\HeuristicLab.Algorithms.DataAnalysis\3.4\HeuristicLab.Algorithms.DataAnalysis-3.4.csproj">
+      <Project>{2E782078-FA81-4B70-B56F-74CE38DAC6C8}</Project>
+      <Name>HeuristicLab.Algorithms.DataAnalysis-3.4</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis\3.4\HeuristicLab.Problems.DataAnalysis-3.4.csproj">
       <Project>{df87c13e-a889-46ff-8153-66dcaa8c5674}</Project>

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

@@ -21 +21 @@
 
 namespace HeuristicLab.Algorithms.DataAnalysis.Views {
-  partial class GaussianProcessRegressionSolutionInteractiveRangeEstimatorView {
+  partial class RegressionSolutionGradientView {
     /// <summary> 
     /// Required designer variable.
@@ -125 +125 @@
       this.tableLayoutPanel.TabIndex = 0;
       // 
-      // GaussianProcessRegressionSolutionInteractiveRangeEstimatorView
+      // RegressionSolutionGradientView
       // 
       this.AllowDrop = true;
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
       this.Controls.Add(this.splitContainer);
-      this.Name = "GaussianProcessRegressionSolutionInteractiveRangeEstimatorView";
+      this.Name = "RegressionSolutionGradientView";
       this.Size = new System.Drawing.Size(715, 591);
       ((System.ComponentModel.ISupportInitialize)(this.chart)).EndInit();

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

@@ -35 +35 @@
 
 namespace HeuristicLab.Algorithms.DataAnalysis.Views {
-  [View("Interactive Estimator")]
-  [Content(typeof(GaussianProcessRegressionSolution))]
-  public partial class GaussianProcessRegressionSolutionInteractiveRangeEstimatorView
+  [View("Gradient View")]
+  [Content(typeof(IConfidenceBoundRegressionSolution))]
+  public partial class RegressionSolutionGradientView
     : DataAnalysisSolutionEvaluationView {
 
@@ -52 +52 @@
     }
 
-    public new GaussianProcessRegressionSolution Content {
-      get { return (GaussianProcessRegressionSolution)base.Content; }
+    public new IConfidenceBoundRegressionSolution Content {
+      get { return (IConfidenceBoundRegressionSolution)base.Content; }
       set { base.Content = value; }
     }
 
-    public GaussianProcessRegressionSolutionInteractiveRangeEstimatorView()
+    public RegressionSolutionGradientView()
       : base() {
       dimensionNames = new List<string>();