Changeset 15137


Ignore:
Timestamp:
07/06/17 10:49:45 (3 weeks ago)
Author:
gkronber
Message:

#2670: merged r14852 from trunk to stable

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  
    132132      <DependentUpon>DensityTrackbar.cs</DependentUpon>
    133133    </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>
    139151    </Compile>
    140152    <Compile Include="FeatureCorrelation\TimeframeFeatureCorrelationCalculator.cs" />
     
    201213      <DependentUpon>FeatureCorrelationView.cs</DependentUpon>
    202214    </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" />
    216215    <Compile Include="Interfaces\IDataPreprocessorStarter.cs" />
     216    <Compile Include="Interfaces\IPartialDependencePlot.cs" />
    217217    <Compile Include="MenuItems\ChangeDataOfOptimizersMenuItem.cs" />
    218218    <Compile Include="MenuItems\ShrinkDataAnalysisRunsMenuItem.cs" />
     
    260260      <DependentUpon>RegressionSolutionLineChartViewBase.cs</DependentUpon>
    261261    </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>
    262268    <Compile Include="Regression\RegressionSolutionResidualsLineChartView.cs">
    263269      <SubType>UserControl</SubType>
     
    277283    <Compile Include="Regression\RegressionSolutionGradientView.Designer.cs">
    278284      <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>
    285285    </Compile>
    286286    <Compile Include="Regression\RegressionTimeframeFeatureCorrelationView.cs">
  • stable/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionGradientView.Designer.cs

    r14166 r15137  
    4646    private void InitializeComponent() {
    4747      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();
    4949      this.configurationGroupBox = new System.Windows.Forms.GroupBox();
    5050      this.tableLayoutPanel = new System.Windows.Forms.TableLayoutPanel();
     
    6565      // splitContainer.Panel1
    6666      //
    67       this.splitContainer.Panel1.Controls.Add(this.gradientChart);
     67      this.splitContainer.Panel1.Controls.Add(this._partialDependencePlot);
    6868      //
    6969      // splitContainer.Panel2
     
    7474      this.splitContainer.TabIndex = 1;
    7575      //
    76       // gradientChart
     76      // _partialDependencePlot
    7777      //
    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;
    8888      //
    8989      // configurationGroupBox
     
    131131    private System.Windows.Forms.GroupBox configurationGroupBox;
    132132    private System.Windows.Forms.TableLayoutPanel tableLayoutPanel;
    133     private Problems.DataAnalysis.Views.GradientChart gradientChart;
     133    private Problems.DataAnalysis.Views.PartialDependencePlot _partialDependencePlot;
    134134  }
    135135}
  • stable/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionGradientView.cs

    r14166 r15137  
    9494
    9595      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();
    9898
    9999      // Add to table and observable lists
     
    122122      double axisMin, axisMax, axisInterval;
    123123      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;
    126126
    127127      trackbars.First().Checked = true;
     
    168168      foreach (var tb in trackbars.Except(new[] { trackBar }))
    169169        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();
    172172    }
    173173
     
    175175      var trackBar = sender as DensityTrackbar;
    176176      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();
    180180    }
    181181
     
    184184      if (trackBar == null) return;
    185185      sharedFixedVariables.SetVariableValue((double)trackBar.Value, variableNames[trackbars.IndexOf(trackBar)], 0);
    186       await gradientChart.RecalculateAsync();
     186      await _partialDependencePlot.RecalculateAsync();
    187187    }
    188188
Note: See TracChangeset for help on using the changeset viewer.