Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
07/06/17 10:19:37 (7 years ago)
Author:
gkronber
Message:

#2650: merged r14826 from trunk to stable. The only remaining conflict is DataTableControl and ScatterPlotControl which have been renamed within r14982 (-> tree conflict).

Location:
stable
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.Problems.DataAnalysis.Views

  • stable/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionVariableImpactsView.Designer.cs

    r14530 r15131  
    4747      this.dataPartitionComboBox = new System.Windows.Forms.ComboBox();
    4848      this.dataPartitionLabel = new System.Windows.Forms.Label();
    49       this.replacementLabel = new System.Windows.Forms.Label();
     49      this.numericVarReplacementLabel = new System.Windows.Forms.Label();
    5050      this.replacementComboBox = new System.Windows.Forms.ComboBox();
     51      this.factorVarReplacementLabel = new System.Windows.Forms.Label();
     52      this.factorVarReplComboBox = new System.Windows.Forms.ComboBox();
    5153      this.SuspendLayout();
    5254      //
     
    5860      this.variableImactsArrayView.Caption = "StringConvertibleArray View";
    5961      this.variableImactsArrayView.Content = null;
    60       this.variableImactsArrayView.Location = new System.Drawing.Point(3, 59);
     62      this.variableImactsArrayView.Location = new System.Drawing.Point(3, 84);
    6163      this.variableImactsArrayView.Name = "variableImactsArrayView";
    6264      this.variableImactsArrayView.ReadOnly = true;
    63       this.variableImactsArrayView.Size = new System.Drawing.Size(304, 223);
    64       this.variableImactsArrayView.TabIndex = 4;
     65      this.variableImactsArrayView.Size = new System.Drawing.Size(363, 278);
     66      this.variableImactsArrayView.TabIndex = 2;
    6567      //
    6668      // dataPartitionComboBox
     
    7173            HeuristicLab.Problems.DataAnalysis.RegressionSolutionVariableImpactsCalculator.DataPartitionEnum.Test,
    7274            HeuristicLab.Problems.DataAnalysis.RegressionSolutionVariableImpactsCalculator.DataPartitionEnum.All});
    73       this.dataPartitionComboBox.Location = new System.Drawing.Point(82, 3);
     75      this.dataPartitionComboBox.Location = new System.Drawing.Point(197, 3);
    7476      this.dataPartitionComboBox.Name = "dataPartitionComboBox";
    7577      this.dataPartitionComboBox.Size = new System.Drawing.Size(121, 21);
     
    8688      this.dataPartitionLabel.Text = "Data partition:";
    8789      //
    88       // replacementLabel
     90      // numericVarReplacementLabel
    8991      //
    90       this.replacementLabel.AutoSize = true;
    91       this.replacementLabel.Location = new System.Drawing.Point(3, 35);
    92       this.replacementLabel.Name = "replacementLabel";
    93       this.replacementLabel.Size = new System.Drawing.Size(73, 13);
    94       this.replacementLabel.TabIndex = 2;
    95       this.replacementLabel.Text = "Replacement:";
     92      this.numericVarReplacementLabel.AutoSize = true;
     93      this.numericVarReplacementLabel.Location = new System.Drawing.Point(3, 33);
     94      this.numericVarReplacementLabel.Name = "numericVarReplacementLabel";
     95      this.numericVarReplacementLabel.Size = new System.Drawing.Size(173, 13);
     96      this.numericVarReplacementLabel.TabIndex = 2;
     97      this.numericVarReplacementLabel.Text = "Replacement for numeric variables:";
    9698      //
    9799      // replacementComboBox
     
    103105            HeuristicLab.Problems.DataAnalysis.RegressionSolutionVariableImpactsCalculator.ReplacementMethodEnum.Noise,
    104106            HeuristicLab.Problems.DataAnalysis.RegressionSolutionVariableImpactsCalculator.ReplacementMethodEnum.Shuffle});
    105       this.replacementComboBox.Location = new System.Drawing.Point(82, 32);
     107      this.replacementComboBox.Location = new System.Drawing.Point(197, 30);
    106108      this.replacementComboBox.Name = "replacementComboBox";
    107109      this.replacementComboBox.Size = new System.Drawing.Size(121, 21);
     
    109111      this.replacementComboBox.SelectedIndexChanged += new System.EventHandler(this.replacementComboBox_SelectedIndexChanged);
    110112      //
     113      // factorVarReplacementLabel
     114      //
     115      this.factorVarReplacementLabel.AutoSize = true;
     116      this.factorVarReplacementLabel.Location = new System.Drawing.Point(3, 60);
     117      this.factorVarReplacementLabel.Name = "factorVarReplacementLabel";
     118      this.factorVarReplacementLabel.Size = new System.Drawing.Size(188, 13);
     119      this.factorVarReplacementLabel.TabIndex = 0;
     120      this.factorVarReplacementLabel.Text = "Replacement for categorical variables:";
     121      //
     122      // factorVarReplComboBox
     123      //
     124      this.factorVarReplComboBox.FormattingEnabled = true;
     125      this.factorVarReplComboBox.Items.AddRange(new object[] {
     126            HeuristicLab.Problems.DataAnalysis.RegressionSolutionVariableImpactsCalculator.FactorReplacementMethodEnum.Best,
     127            HeuristicLab.Problems.DataAnalysis.RegressionSolutionVariableImpactsCalculator.FactorReplacementMethodEnum.Mode,
     128            HeuristicLab.Problems.DataAnalysis.RegressionSolutionVariableImpactsCalculator.FactorReplacementMethodEnum.Shuffle});
     129      this.factorVarReplComboBox.Location = new System.Drawing.Point(197, 57);
     130      this.factorVarReplComboBox.Name = "factorVarReplComboBox";
     131      this.factorVarReplComboBox.Size = new System.Drawing.Size(121, 21);
     132      this.factorVarReplComboBox.TabIndex = 1;
     133      this.factorVarReplComboBox.SelectedIndexChanged += new System.EventHandler(this.replacementComboBox_SelectedIndexChanged);
     134      //
    111135      // RegressionSolutionVariableImpactsView
    112136      //
    113137      this.AllowDrop = true;
    114138      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
     139      this.Controls.Add(this.factorVarReplComboBox);
     140      this.Controls.Add(this.factorVarReplacementLabel);
    115141      this.Controls.Add(this.replacementComboBox);
    116       this.Controls.Add(this.replacementLabel);
     142      this.Controls.Add(this.numericVarReplacementLabel);
    117143      this.Controls.Add(this.dataPartitionLabel);
    118144      this.Controls.Add(this.dataPartitionComboBox);
    119145      this.Controls.Add(this.variableImactsArrayView);
    120146      this.Name = "RegressionSolutionVariableImpactsView";
    121       this.Size = new System.Drawing.Size(310, 285);
     147      this.Size = new System.Drawing.Size(369, 365);
    122148      this.ResumeLayout(false);
    123149      this.PerformLayout();
     
    130156    private System.Windows.Forms.ComboBox dataPartitionComboBox;
    131157    private System.Windows.Forms.Label dataPartitionLabel;
    132     private System.Windows.Forms.Label replacementLabel;
     158    private System.Windows.Forms.Label numericVarReplacementLabel;
    133159    private System.Windows.Forms.ComboBox replacementComboBox;
     160    private System.Windows.Forms.Label factorVarReplacementLabel;
     161    private System.Windows.Forms.ComboBox factorVarReplComboBox;
    134162  }
    135163}
Note: See TracChangeset for help on using the changeset viewer.