Changeset 15137 for stable/HeuristicLab.Problems.DataAnalysis.Views/3.4
- Timestamp:
- 07/06/17 10:49:45 (7 years ago)
- Location:
- stable/HeuristicLab.Problems.DataAnalysis.Views/3.4
- Files:
-
- 9 deleted
- 3 edited
- 9 copied
Legend:
- Unmodified
- Added
- Removed
-
stable/HeuristicLab.Problems.DataAnalysis.Views/3.4/HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj
r15131 r15137 132 132 <DependentUpon>DensityTrackbar.cs</DependentUpon> 133 133 </Compile> 134 <Compile Include="Controls\FactorGradientChart.cs"> 135 <SubType>UserControl</SubType> 136 </Compile> 137 <Compile Include="Controls\FactorGradientChart.Designer.cs"> 138 <DependentUpon>FactorGradientChart.cs</DependentUpon> 134 <Compile Include="Controls\FactorPartialDependencePlot.cs"> 135 <SubType>UserControl</SubType> 136 </Compile> 137 <Compile Include="Controls\FactorPartialDependencePlot.Designer.cs"> 138 <DependentUpon>FactorPartialDependencePlot.cs</DependentUpon> 139 </Compile> 140 <Compile Include="Controls\PartialDependencePlot.cs"> 141 <SubType>UserControl</SubType> 142 </Compile> 143 <Compile Include="Controls\PartialDependencePlot.Designer.cs"> 144 <DependentUpon>PartialDependencePlot.cs</DependentUpon> 145 </Compile> 146 <Compile Include="Controls\PartialDependencePlotConfigurationDialog.cs"> 147 <SubType>Form</SubType> 148 </Compile> 149 <Compile Include="Controls\PartialDependencePlotConfigurationDialog.Designer.cs"> 150 <DependentUpon>PartialDependencePlotConfigurationDialog.cs</DependentUpon> 139 151 </Compile> 140 152 <Compile Include="FeatureCorrelation\TimeframeFeatureCorrelationCalculator.cs" /> … … 201 213 <DependentUpon>FeatureCorrelationView.cs</DependentUpon> 202 214 </Compile> 203 <Compile Include="Controls\GradientChart.cs">204 <SubType>UserControl</SubType>205 </Compile>206 <Compile Include="Controls\GradientChart.Designer.cs">207 <DependentUpon>GradientChart.cs</DependentUpon>208 </Compile>209 <Compile Include="Controls\GradientChartConfigurationDialog.cs">210 <SubType>Form</SubType>211 </Compile>212 <Compile Include="Controls\GradientChartConfigurationDialog.Designer.cs">213 <DependentUpon>GradientChartConfigurationDialog.cs</DependentUpon>214 </Compile>215 <Compile Include="Interfaces\IGradientChart.cs" />216 215 <Compile Include="Interfaces\IDataPreprocessorStarter.cs" /> 216 <Compile Include="Interfaces\IPartialDependencePlot.cs" /> 217 217 <Compile Include="MenuItems\ChangeDataOfOptimizersMenuItem.cs" /> 218 218 <Compile Include="MenuItems\ShrinkDataAnalysisRunsMenuItem.cs" /> … … 260 260 <DependentUpon>RegressionSolutionLineChartViewBase.cs</DependentUpon> 261 261 </Compile> 262 <Compile Include="Regression\RegressionSolutionPartialDependencePlotView.cs"> 263 <SubType>UserControl</SubType> 264 </Compile> 265 <Compile Include="Regression\RegressionSolutionPartialDependencePlotView.Designer.cs"> 266 <DependentUpon>RegressionSolutionPartialDependencePlotView.cs</DependentUpon> 267 </Compile> 262 268 <Compile Include="Regression\RegressionSolutionResidualsLineChartView.cs"> 263 269 <SubType>UserControl</SubType> … … 277 283 <Compile Include="Regression\RegressionSolutionGradientView.Designer.cs"> 278 284 <DependentUpon>RegressionSolutionGradientView.cs</DependentUpon> 279 </Compile>280 <Compile Include="Regression\RegressionSolutionTargetResponseGradientView.cs">281 <SubType>UserControl</SubType>282 </Compile>283 <Compile Include="Regression\RegressionSolutionTargetResponseGradientView.Designer.cs">284 <DependentUpon>RegressionSolutionTargetResponseGradientView.cs</DependentUpon>285 285 </Compile> 286 286 <Compile Include="Regression\RegressionTimeframeFeatureCorrelationView.cs"> -
stable/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionGradientView.Designer.cs
r14166 r15137 46 46 private void InitializeComponent() { 47 47 this.splitContainer = new System.Windows.Forms.SplitContainer(); 48 this. gradientChart = new HeuristicLab.Problems.DataAnalysis.Views.GradientChart();48 this._partialDependencePlot = new HeuristicLab.Problems.DataAnalysis.Views.PartialDependencePlot(); 49 49 this.configurationGroupBox = new System.Windows.Forms.GroupBox(); 50 50 this.tableLayoutPanel = new System.Windows.Forms.TableLayoutPanel(); … … 65 65 // splitContainer.Panel1 66 66 // 67 this.splitContainer.Panel1.Controls.Add(this. gradientChart);67 this.splitContainer.Panel1.Controls.Add(this._partialDependencePlot); 68 68 // 69 69 // splitContainer.Panel2 … … 74 74 this.splitContainer.TabIndex = 1; 75 75 // 76 // gradientChart76 // _partialDependencePlot 77 77 // 78 this. gradientChart.Dock = System.Windows.Forms.DockStyle.Fill;79 this. gradientChart.DrawingSteps = 1000;80 this. gradientChart.Location = new System.Drawing.Point(0, 0);81 this. gradientChart.Name = "gradientChart";82 this. gradientChart.ShowCursor = false;83 this. gradientChart.ShowLegend = false;84 this. gradientChart.Size = new System.Drawing.Size(715, 376);85 this. gradientChart.TabIndex = 0;86 this. gradientChart.XAxisTicks = 10;87 this. gradientChart.YAxisTicks = 5;78 this._partialDependencePlot.Dock = System.Windows.Forms.DockStyle.Fill; 79 this._partialDependencePlot.DrawingSteps = 1000; 80 this._partialDependencePlot.Location = new System.Drawing.Point(0, 0); 81 this._partialDependencePlot.Name = "_partialDependencePlot"; 82 this._partialDependencePlot.ShowCursor = false; 83 this._partialDependencePlot.ShowLegend = false; 84 this._partialDependencePlot.Size = new System.Drawing.Size(715, 376); 85 this._partialDependencePlot.TabIndex = 0; 86 this._partialDependencePlot.XAxisTicks = 10; 87 this._partialDependencePlot.YAxisTicks = 5; 88 88 // 89 89 // configurationGroupBox … … 131 131 private System.Windows.Forms.GroupBox configurationGroupBox; 132 132 private System.Windows.Forms.TableLayoutPanel tableLayoutPanel; 133 private Problems.DataAnalysis.Views. GradientChart gradientChart;133 private Problems.DataAnalysis.Views.PartialDependencePlot _partialDependencePlot; 134 134 } 135 135 } -
stable/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionGradientView.cs
r14166 r15137 94 94 95 95 sharedFixedVariables = new ModifiableDataset(variableNames, newTrackbars.Select(tb => new List<double>(1) { (double)tb.Value })); 96 gradientChart.Configure(new[] { Content }, sharedFixedVariables, variableNames.First(), DrawingSteps);97 await gradientChart.RecalculateAsync();96 _partialDependencePlot.Configure(new[] { Content }, sharedFixedVariables, variableNames.First(), DrawingSteps); 97 await _partialDependencePlot.RecalculateAsync(); 98 98 99 99 // Add to table and observable lists … … 122 122 double axisMin, axisMax, axisInterval; 123 123 ChartUtil.CalculateAxisInterval(min - scale * range, max + scale * range, 5, out axisMin, out axisMax, out axisInterval); 124 gradientChart.FixedYAxisMin = axisMin;125 gradientChart.FixedYAxisMax = axisMax;124 _partialDependencePlot.FixedYAxisMin = axisMin; 125 _partialDependencePlot.FixedYAxisMax = axisMax; 126 126 127 127 trackbars.First().Checked = true; … … 168 168 foreach (var tb in trackbars.Except(new[] { trackBar })) 169 169 tb.Checked = false; 170 gradientChart.FreeVariable = variableNames[trackbars.IndexOf(trackBar)];171 await gradientChart.RecalculateAsync();170 _partialDependencePlot.FreeVariable = variableNames[trackbars.IndexOf(trackBar)]; 171 await _partialDependencePlot.RecalculateAsync(); 172 172 } 173 173 … … 175 175 var trackBar = sender as DensityTrackbar; 176 176 if (trackBar == null || !trackBar.Checked) return; 177 gradientChart.FixedXAxisMin = trackBar.Limits.Lower;178 gradientChart.FixedXAxisMax = trackBar.Limits.Upper;179 await gradientChart.RecalculateAsync();177 _partialDependencePlot.FixedXAxisMin = trackBar.Limits.Lower; 178 _partialDependencePlot.FixedXAxisMax = trackBar.Limits.Upper; 179 await _partialDependencePlot.RecalculateAsync(); 180 180 } 181 181 … … 184 184 if (trackBar == null) return; 185 185 sharedFixedVariables.SetVariableValue((double)trackBar.Value, variableNames[trackbars.IndexOf(trackBar)], 0); 186 await gradientChart.RecalculateAsync();186 await _partialDependencePlot.RecalculateAsync(); 187 187 } 188 188
Note: See TracChangeset
for help on using the changeset viewer.