Changeset 12502


Ignore:
Timestamp:
06/23/15 17:20:23 (4 years ago)
Author:
ehopf
Message:

#2335: Corrected the preview column count in the Manipulation-View (Defect 5) and added some additional information.

Location:
branches/DataPreprocessingImprovements/HeuristicLab.DataPreprocessing.Views/3.4
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/DataPreprocessingImprovements/HeuristicLab.DataPreprocessing.Views/3.4/ManipulationView.Designer.cs

    r11381 r12502  
    4949      this.label10 = new System.Windows.Forms.Label();
    5050      this.tabDataShuffle = new System.Windows.Forms.TabPage();
     51      this.shuffleSeparatelyCheckbox = new System.Windows.Forms.CheckBox();
    5152      this.lblShuffleProperties = new System.Windows.Forms.Label();
    5253      this.grpBoxPreview = new System.Windows.Forms.GroupBox();
     
    6667      this.lblPreviewShuffle = new System.Windows.Forms.Label();
    6768      this.label9 = new System.Windows.Forms.Label();
    68       this.shuffleSeparatelyCheckbox = new System.Windows.Forms.CheckBox();
     69      this.panel1 = new System.Windows.Forms.Panel();
     70      this.panel2 = new System.Windows.Forms.Panel();
    6971      this.grpBoxData.SuspendLayout();
    7072      this.tabsData.SuspendLayout();
     
    8385      this.tabPreviewReplaceMissingValues.SuspendLayout();
    8486      this.tabPreviewShuffle.SuspendLayout();
     87      this.panel1.SuspendLayout();
     88      this.panel2.SuspendLayout();
    8589      this.SuspendLayout();
    8690      //
     
    9094            | System.Windows.Forms.AnchorStyles.Right)));
    9195      this.lstMethods.FormattingEnabled = true;
     96      this.lstMethods.ItemHeight = 16;
    9297      this.lstMethods.Items.AddRange(new object[] {
    9398            "Delete Columns with insufficient Information",
     
    96101            "Replace Missing Values",
    97102            "Shuffle Data"});
    98       this.lstMethods.Location = new System.Drawing.Point(3, 3);
     103      this.lstMethods.Location = new System.Drawing.Point(4, 4);
     104      this.lstMethods.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
    99105      this.lstMethods.Name = "lstMethods";
    100       this.lstMethods.Size = new System.Drawing.Size(733, 95);
     106      this.lstMethods.Size = new System.Drawing.Size(976, 116);
    101107      this.lstMethods.Sorted = true;
    102108      this.lstMethods.TabIndex = 0;
     
    107113      this.btnApply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
    108114      this.btnApply.Enabled = false;
    109       this.btnApply.Location = new System.Drawing.Point(603, 500);
     115      this.btnApply.Location = new System.Drawing.Point(804, 615);
     116      this.btnApply.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
    110117      this.btnApply.Name = "btnApply";
    111       this.btnApply.Size = new System.Drawing.Size(129, 23);
     118      this.btnApply.Size = new System.Drawing.Size(172, 28);
    112119      this.btnApply.TabIndex = 2;
    113120      this.btnApply.Text = "Apply Manipulation";
     
    120127            | System.Windows.Forms.AnchorStyles.Right)));
    121128      this.grpBoxData.Controls.Add(this.tabsData);
    122       this.grpBoxData.Location = new System.Drawing.Point(4, 105);
     129      this.grpBoxData.Location = new System.Drawing.Point(5, 129);
     130      this.grpBoxData.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
    123131      this.grpBoxData.Name = "grpBoxData";
    124       this.grpBoxData.Size = new System.Drawing.Size(732, 189);
     132      this.grpBoxData.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
     133      this.grpBoxData.Size = new System.Drawing.Size(976, 233);
    125134      this.grpBoxData.TabIndex = 3;
    126135      this.grpBoxData.TabStop = false;
     
    138147      this.tabsData.Controls.Add(this.tabDataShuffle);
    139148      this.tabsData.ItemSize = new System.Drawing.Size(58, 18);
    140       this.tabsData.Location = new System.Drawing.Point(6, 19);
     149      this.tabsData.Location = new System.Drawing.Point(8, 23);
     150      this.tabsData.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
    141151      this.tabsData.Name = "tabsData";
    142152      this.tabsData.SelectedIndex = 0;
    143       this.tabsData.Size = new System.Drawing.Size(719, 164);
     153      this.tabsData.Size = new System.Drawing.Size(959, 202);
    144154      this.tabsData.TabIndex = 3;
    145155      //
     
    148158      this.tabPage1.Controls.Add(this.label7);
    149159      this.tabPage1.Location = new System.Drawing.Point(4, 22);
     160      this.tabPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
    150161      this.tabPage1.Name = "tabPage1";
    151       this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
    152       this.tabPage1.Size = new System.Drawing.Size(711, 138);
     162      this.tabPage1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
     163      this.tabPage1.Size = new System.Drawing.Size(951, 176);
    153164      this.tabPage1.TabIndex = 5;
    154165      this.tabPage1.Text = "tabDataInactive";
     
    159170      this.label7.AutoSize = true;
    160171      this.label7.Enabled = false;
    161       this.label7.Location = new System.Drawing.Point(3, 3);
     172      this.label7.Location = new System.Drawing.Point(4, 4);
     173      this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
    162174      this.label7.Name = "label7";
    163       this.label7.Size = new System.Drawing.Size(259, 13);
     175      this.label7.Size = new System.Drawing.Size(345, 17);
    164176      this.label7.TabIndex = 1;
    165177      this.label7.Text = "Please select one of the manipulation methods above";
     
    171183      this.tabDataDeleteColumnsInformation.Controls.Add(this.label1);
    172184      this.tabDataDeleteColumnsInformation.Location = new System.Drawing.Point(4, 22);
     185      this.tabDataDeleteColumnsInformation.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
    173186      this.tabDataDeleteColumnsInformation.Name = "tabDataDeleteColumnsInformation";
    174       this.tabDataDeleteColumnsInformation.Padding = new System.Windows.Forms.Padding(3);
    175       this.tabDataDeleteColumnsInformation.Size = new System.Drawing.Size(711, 138);
     187      this.tabDataDeleteColumnsInformation.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
     188      this.tabDataDeleteColumnsInformation.Size = new System.Drawing.Size(951, 176);
    176189      this.tabDataDeleteColumnsInformation.TabIndex = 0;
    177190      this.tabDataDeleteColumnsInformation.Text = "del columns info";
     
    181194      //
    182195      this.label2.AutoSize = true;
    183       this.label2.Location = new System.Drawing.Point(204, 3);
     196      this.label2.Location = new System.Drawing.Point(272, 4);
     197      this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
    184198      this.label2.Name = "label2";
    185       this.label2.Size = new System.Drawing.Size(89, 13);
     199      this.label2.Size = new System.Drawing.Size(120, 17);
    186200      this.label2.TabIndex = 5;
    187201      this.label2.Text = "% missing values.";
     
    189203      // txtDeleteColumnsInfo
    190204      //
    191       this.txtDeleteColumnsInfo.Location = new System.Drawing.Point(164, 0);
     205      this.txtDeleteColumnsInfo.Location = new System.Drawing.Point(219, 0);
     206      this.txtDeleteColumnsInfo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
    192207      this.txtDeleteColumnsInfo.Name = "txtDeleteColumnsInfo";
    193       this.txtDeleteColumnsInfo.Size = new System.Drawing.Size(34, 20);
     208      this.txtDeleteColumnsInfo.Size = new System.Drawing.Size(44, 22);
    194209      this.txtDeleteColumnsInfo.TabIndex = 4;
    195210      this.txtDeleteColumnsInfo.TextChanged += new System.EventHandler(this.txtDeleteColumnsInfo_TextChanged);
     
    198213      //
    199214      this.label1.AutoSize = true;
    200       this.label1.Location = new System.Drawing.Point(3, 3);
     215      this.label1.Location = new System.Drawing.Point(4, 4);
     216      this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
    201217      this.label1.Name = "label1";
    202       this.label1.Size = new System.Drawing.Size(155, 13);
     218      this.label1.Size = new System.Drawing.Size(205, 17);
    203219      this.label1.TabIndex = 3;
    204220      this.label1.Text = "Delete columns with more than ";
     
    209225      this.tabDataDeleteColumnsVariance.Controls.Add(this.label4);
    210226      this.tabDataDeleteColumnsVariance.Location = new System.Drawing.Point(4, 22);
     227      this.tabDataDeleteColumnsVariance.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
    211228      this.tabDataDeleteColumnsVariance.Name = "tabDataDeleteColumnsVariance";
    212       this.tabDataDeleteColumnsVariance.Padding = new System.Windows.Forms.Padding(3);
    213       this.tabDataDeleteColumnsVariance.Size = new System.Drawing.Size(711, 138);
     229      this.tabDataDeleteColumnsVariance.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
     230      this.tabDataDeleteColumnsVariance.Size = new System.Drawing.Size(951, 176);
    214231      this.tabDataDeleteColumnsVariance.TabIndex = 1;
    215232      this.tabDataDeleteColumnsVariance.Text = "del columns variance";
     
    218235      // txtDeleteColumnsVariance
    219236      //
    220       this.txtDeleteColumnsVariance.Location = new System.Drawing.Point(229, 0);
     237      this.txtDeleteColumnsVariance.Location = new System.Drawing.Point(305, 0);
     238      this.txtDeleteColumnsVariance.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
    221239      this.txtDeleteColumnsVariance.Name = "txtDeleteColumnsVariance";
    222       this.txtDeleteColumnsVariance.Size = new System.Drawing.Size(135, 20);
     240      this.txtDeleteColumnsVariance.Size = new System.Drawing.Size(179, 22);
    223241      this.txtDeleteColumnsVariance.TabIndex = 4;
    224242      this.txtDeleteColumnsVariance.TextChanged += new System.EventHandler(this.txtDeleteColumnsVariance_TextChanged);
     
    227245      //
    228246      this.label4.AutoSize = true;
    229       this.label4.Location = new System.Drawing.Point(3, 3);
     247      this.label4.Location = new System.Drawing.Point(4, 4);
     248      this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
    230249      this.label4.Name = "label4";
    231       this.label4.Size = new System.Drawing.Size(220, 13);
     250      this.label4.Size = new System.Drawing.Size(292, 17);
    232251      this.label4.TabIndex = 3;
    233252      this.label4.Text = "Delete columns with a variance smaller than  ";
     
    239258      this.tabDataDeleteRowsInfo.Controls.Add(this.label5);
    240259      this.tabDataDeleteRowsInfo.Location = new System.Drawing.Point(4, 22);
     260      this.tabDataDeleteRowsInfo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
    241261      this.tabDataDeleteRowsInfo.Name = "tabDataDeleteRowsInfo";
    242       this.tabDataDeleteRowsInfo.Padding = new System.Windows.Forms.Padding(3);
    243       this.tabDataDeleteRowsInfo.Size = new System.Drawing.Size(711, 138);
     262      this.tabDataDeleteRowsInfo.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
     263      this.tabDataDeleteRowsInfo.Size = new System.Drawing.Size(951, 176);
    244264      this.tabDataDeleteRowsInfo.TabIndex = 2;
    245265      this.tabDataDeleteRowsInfo.Text = "del rows info";
     
    249269      //
    250270      this.label3.AutoSize = true;
    251       this.label3.Location = new System.Drawing.Point(189, 3);
     271      this.label3.Location = new System.Drawing.Point(252, 4);
     272      this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
    252273      this.label3.Name = "label3";
    253       this.label3.Size = new System.Drawing.Size(89, 13);
     274      this.label3.Size = new System.Drawing.Size(120, 17);
    254275      this.label3.TabIndex = 8;
    255276      this.label3.Text = "% missing values.";
     
    257278      // txtDeleteRowsInfo
    258279      //
    259       this.txtDeleteRowsInfo.Location = new System.Drawing.Point(147, 0);
     280      this.txtDeleteRowsInfo.Location = new System.Drawing.Point(196, 0);
     281      this.txtDeleteRowsInfo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
    260282      this.txtDeleteRowsInfo.Name = "txtDeleteRowsInfo";
    261       this.txtDeleteRowsInfo.Size = new System.Drawing.Size(34, 20);
     283      this.txtDeleteRowsInfo.Size = new System.Drawing.Size(44, 22);
    262284      this.txtDeleteRowsInfo.TabIndex = 7;
    263285      this.txtDeleteRowsInfo.TextChanged += new System.EventHandler(this.txtDeleteRowsInfo_TextChanged);
     
    266288      //
    267289      this.label5.AutoSize = true;
    268       this.label5.Location = new System.Drawing.Point(3, 3);
     290      this.label5.Location = new System.Drawing.Point(4, 4);
     291      this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
    269292      this.label5.Name = "label5";
    270       this.label5.Size = new System.Drawing.Size(138, 13);
     293      this.label5.Size = new System.Drawing.Size(182, 17);
    271294      this.label5.TabIndex = 6;
    272295      this.label5.Text = "Delete rows with more than ";
     
    281304      this.tabReplaceMissingValues.Controls.Add(this.label10);
    282305      this.tabReplaceMissingValues.Location = new System.Drawing.Point(4, 22);
     306      this.tabReplaceMissingValues.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
    283307      this.tabReplaceMissingValues.Name = "tabReplaceMissingValues";
    284       this.tabReplaceMissingValues.Padding = new System.Windows.Forms.Padding(3);
    285       this.tabReplaceMissingValues.Size = new System.Drawing.Size(711, 138);
     308      this.tabReplaceMissingValues.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
     309      this.tabReplaceMissingValues.Size = new System.Drawing.Size(951, 176);
    286310      this.tabReplaceMissingValues.TabIndex = 6;
    287311      this.tabReplaceMissingValues.Text = "repl missing vals";
     
    290314      // txtReplaceValue
    291315      //
    292       this.txtReplaceValue.Location = new System.Drawing.Point(173, 27);
     316      this.txtReplaceValue.Location = new System.Drawing.Point(231, 33);
     317      this.txtReplaceValue.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
    293318      this.txtReplaceValue.Name = "txtReplaceValue";
    294       this.txtReplaceValue.Size = new System.Drawing.Size(100, 20);
     319      this.txtReplaceValue.Size = new System.Drawing.Size(132, 22);
    295320      this.txtReplaceValue.TabIndex = 2;
    296321      this.txtReplaceValue.TextChanged += new System.EventHandler(this.txtReplaceValue_TextChanged);
     
    300325      this.cmbVariableNames.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
    301326      this.cmbVariableNames.FormattingEnabled = true;
    302       this.cmbVariableNames.Location = new System.Drawing.Point(142, 0);
     327      this.cmbVariableNames.Location = new System.Drawing.Point(189, 0);
     328      this.cmbVariableNames.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
    303329      this.cmbVariableNames.Name = "cmbVariableNames";
    304       this.cmbVariableNames.Size = new System.Drawing.Size(121, 21);
     330      this.cmbVariableNames.Size = new System.Drawing.Size(160, 24);
    305331      this.cmbVariableNames.TabIndex = 1;
    306332      this.cmbVariableNames.SelectedIndexChanged += new System.EventHandler(this.cmbReplaceWith_SelectedIndexChanged);
     
    316342            "Most Common",
    317343            "Random"});
    318       this.cmbReplaceWith.Location = new System.Drawing.Point(35, 27);
     344      this.cmbReplaceWith.Location = new System.Drawing.Point(47, 33);
     345      this.cmbReplaceWith.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
    319346      this.cmbReplaceWith.Name = "cmbReplaceWith";
    320       this.cmbReplaceWith.Size = new System.Drawing.Size(121, 21);
     347      this.cmbReplaceWith.Size = new System.Drawing.Size(160, 24);
    321348      this.cmbReplaceWith.TabIndex = 1;
    322349      this.cmbReplaceWith.SelectedIndexChanged += new System.EventHandler(this.cmbReplaceWith_SelectedIndexChanged);
     
    325352      //
    326353      this.lblValueColon.AutoSize = true;
    327       this.lblValueColon.Location = new System.Drawing.Point(157, 30);
     354      this.lblValueColon.Location = new System.Drawing.Point(209, 37);
     355      this.lblValueColon.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
    328356      this.lblValueColon.Name = "lblValueColon";
    329       this.lblValueColon.Size = new System.Drawing.Size(10, 13);
     357      this.lblValueColon.Size = new System.Drawing.Size(12, 17);
    330358      this.lblValueColon.TabIndex = 0;
    331359      this.lblValueColon.Text = ":";
     
    334362      //
    335363      this.label8.AutoSize = true;
    336       this.label8.Location = new System.Drawing.Point(3, 30);
     364      this.label8.Location = new System.Drawing.Point(4, 37);
     365      this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
    337366      this.label8.Name = "label8";
    338       this.label8.Size = new System.Drawing.Size(26, 13);
     367      this.label8.Size = new System.Drawing.Size(32, 17);
    339368      this.label8.TabIndex = 0;
    340369      this.label8.Text = "with";
     
    343372      //
    344373      this.label10.AutoSize = true;
    345       this.label10.Location = new System.Drawing.Point(3, 3);
     374      this.label10.Location = new System.Drawing.Point(4, 4);
     375      this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
    346376      this.label10.Name = "label10";
    347       this.label10.Size = new System.Drawing.Size(133, 13);
     377      this.label10.Size = new System.Drawing.Size(177, 17);
    348378      this.label10.TabIndex = 0;
    349379      this.label10.Text = "Replace missing values for";
     
    354384      this.tabDataShuffle.Controls.Add(this.lblShuffleProperties);
    355385      this.tabDataShuffle.Location = new System.Drawing.Point(4, 22);
     386      this.tabDataShuffle.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
    356387      this.tabDataShuffle.Name = "tabDataShuffle";
    357       this.tabDataShuffle.Padding = new System.Windows.Forms.Padding(3);
    358       this.tabDataShuffle.Size = new System.Drawing.Size(711, 138);
     388      this.tabDataShuffle.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
     389      this.tabDataShuffle.Size = new System.Drawing.Size(951, 176);
    359390      this.tabDataShuffle.TabIndex = 4;
    360391      this.tabDataShuffle.Text = "shuffle";
    361392      this.tabDataShuffle.UseVisualStyleBackColor = true;
    362393      //
     394      // shuffleSeparatelyCheckbox
     395      //
     396      this.shuffleSeparatelyCheckbox.AutoSize = true;
     397      this.shuffleSeparatelyCheckbox.Location = new System.Drawing.Point(8, 2);
     398      this.shuffleSeparatelyCheckbox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
     399      this.shuffleSeparatelyCheckbox.Name = "shuffleSeparatelyCheckbox";
     400      this.shuffleSeparatelyCheckbox.Size = new System.Drawing.Size(312, 21);
     401      this.shuffleSeparatelyCheckbox.TabIndex = 1;
     402      this.shuffleSeparatelyCheckbox.Text = "Shuffle training and test partitions separately";
     403      this.shuffleSeparatelyCheckbox.UseVisualStyleBackColor = true;
     404      //
    363405      // lblShuffleProperties
    364406      //
    365407      this.lblShuffleProperties.AutoSize = true;
    366408      this.lblShuffleProperties.Enabled = false;
    367       this.lblShuffleProperties.Location = new System.Drawing.Point(3, 3);
     409      this.lblShuffleProperties.Location = new System.Drawing.Point(4, 4);
     410      this.lblShuffleProperties.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
    368411      this.lblShuffleProperties.Name = "lblShuffleProperties";
    369       this.lblShuffleProperties.Size = new System.Drawing.Size(115, 13);
     412      this.lblShuffleProperties.Size = new System.Drawing.Size(154, 17);
    370413      this.lblShuffleProperties.TabIndex = 0;
    371414      this.lblShuffleProperties.Text = "No properties available";
     
    377420            | System.Windows.Forms.AnchorStyles.Right)));
    378421      this.grpBoxPreview.Controls.Add(this.tabsPreview);
    379       this.grpBoxPreview.Location = new System.Drawing.Point(4, 301);
     422      this.grpBoxPreview.Location = new System.Drawing.Point(5, 370);
     423      this.grpBoxPreview.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
    380424      this.grpBoxPreview.Name = "grpBoxPreview";
    381       this.grpBoxPreview.Size = new System.Drawing.Size(732, 193);
     425      this.grpBoxPreview.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
     426      this.grpBoxPreview.Size = new System.Drawing.Size(976, 238);
    382427      this.grpBoxPreview.TabIndex = 4;
    383428      this.grpBoxPreview.TabStop = false;
     
    395440      this.tabsPreview.Controls.Add(this.tabPreviewShuffle);
    396441      this.tabsPreview.ItemSize = new System.Drawing.Size(58, 18);
    397       this.tabsPreview.Location = new System.Drawing.Point(6, 19);
     442      this.tabsPreview.Location = new System.Drawing.Point(8, 23);
     443      this.tabsPreview.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
    398444      this.tabsPreview.Name = "tabsPreview";
    399445      this.tabsPreview.SelectedIndex = 0;
    400       this.tabsPreview.Size = new System.Drawing.Size(719, 168);
     446      this.tabsPreview.Size = new System.Drawing.Size(959, 207);
    401447      this.tabsPreview.TabIndex = 3;
    402448      //
     
    405451      this.tabPreviewInactive.Controls.Add(this.lblPreviewInActive);
    406452      this.tabPreviewInactive.Location = new System.Drawing.Point(4, 22);
     453      this.tabPreviewInactive.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
    407454      this.tabPreviewInactive.Name = "tabPreviewInactive";
    408       this.tabPreviewInactive.Padding = new System.Windows.Forms.Padding(3);
    409       this.tabPreviewInactive.Size = new System.Drawing.Size(711, 142);
     455      this.tabPreviewInactive.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
     456      this.tabPreviewInactive.Size = new System.Drawing.Size(951, 181);
    410457      this.tabPreviewInactive.TabIndex = 5;
    411458      this.tabPreviewInactive.Text = "inactive";
     
    415462      //
    416463      this.lblPreviewInActive.AutoSize = true;
    417       this.lblPreviewInActive.Location = new System.Drawing.Point(3, 3);
     464      this.lblPreviewInActive.Location = new System.Drawing.Point(4, 4);
     465      this.lblPreviewInActive.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
    418466      this.lblPreviewInActive.Name = "lblPreviewInActive";
    419       this.lblPreviewInActive.Size = new System.Drawing.Size(361, 39);
     467      this.lblPreviewInActive.Size = new System.Drawing.Size(491, 51);
    420468      this.lblPreviewInActive.TabIndex = 2;
    421469      this.lblPreviewInActive.Text = "Filters are active and thus manipulations cannot be applied!\r\n\r\nPlease deactive t" +
     
    425473      // tabPreviewDeleteColumnsInfo
    426474      //
    427       this.tabPreviewDeleteColumnsInfo.Controls.Add(this.lblPreviewColumnsInfo);
     475      this.tabPreviewDeleteColumnsInfo.Controls.Add(this.panel1);
    428476      this.tabPreviewDeleteColumnsInfo.Location = new System.Drawing.Point(4, 22);
     477      this.tabPreviewDeleteColumnsInfo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
    429478      this.tabPreviewDeleteColumnsInfo.Name = "tabPreviewDeleteColumnsInfo";
    430       this.tabPreviewDeleteColumnsInfo.Padding = new System.Windows.Forms.Padding(3);
    431       this.tabPreviewDeleteColumnsInfo.Size = new System.Drawing.Size(711, 142);
     479      this.tabPreviewDeleteColumnsInfo.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
     480      this.tabPreviewDeleteColumnsInfo.Size = new System.Drawing.Size(951, 181);
    432481      this.tabPreviewDeleteColumnsInfo.TabIndex = 0;
    433482      this.tabPreviewDeleteColumnsInfo.Text = "del columns info";
     
    437486      //
    438487      this.lblPreviewColumnsInfo.AutoSize = true;
    439       this.lblPreviewColumnsInfo.Location = new System.Drawing.Point(3, 3);
     488      this.lblPreviewColumnsInfo.Dock = System.Windows.Forms.DockStyle.Left;
     489      this.lblPreviewColumnsInfo.Location = new System.Drawing.Point(0, 0);
     490      this.lblPreviewColumnsInfo.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
    440491      this.lblPreviewColumnsInfo.Name = "lblPreviewColumnsInfo";
    441       this.lblPreviewColumnsInfo.Size = new System.Drawing.Size(318, 13);
     492      this.lblPreviewColumnsInfo.Size = new System.Drawing.Size(423, 17);
    442493      this.lblPreviewColumnsInfo.TabIndex = 1;
    443494      this.lblPreviewColumnsInfo.Text = "{0} columns with more than {1} % missing values would be deleted";
     
    445496      // tabPreviewDeleteColumnsVariance
    446497      //
     498      this.tabPreviewDeleteColumnsVariance.Controls.Add(this.panel2);
    447499      this.tabPreviewDeleteColumnsVariance.Controls.Add(this.label12);
    448       this.tabPreviewDeleteColumnsVariance.Controls.Add(this.lblPreviewColumnsVariance);
    449500      this.tabPreviewDeleteColumnsVariance.Location = new System.Drawing.Point(4, 22);
     501      this.tabPreviewDeleteColumnsVariance.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
    450502      this.tabPreviewDeleteColumnsVariance.Name = "tabPreviewDeleteColumnsVariance";
    451       this.tabPreviewDeleteColumnsVariance.Padding = new System.Windows.Forms.Padding(3);
    452       this.tabPreviewDeleteColumnsVariance.Size = new System.Drawing.Size(711, 142);
     503      this.tabPreviewDeleteColumnsVariance.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
     504      this.tabPreviewDeleteColumnsVariance.Size = new System.Drawing.Size(951, 181);
    453505      this.tabPreviewDeleteColumnsVariance.TabIndex = 1;
    454506      this.tabPreviewDeleteColumnsVariance.Text = "del columns variance";
     
    458510      //
    459511      this.label12.AutoSize = true;
    460       this.label12.Location = new System.Drawing.Point(6, 22);
     512      this.label12.Location = new System.Drawing.Point(8, 27);
     513      this.label12.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
    461514      this.label12.Name = "label12";
    462       this.label12.Size = new System.Drawing.Size(0, 13);
     515      this.label12.Size = new System.Drawing.Size(0, 17);
    463516      this.label12.TabIndex = 2;
    464517      //
     
    466519      //
    467520      this.lblPreviewColumnsVariance.AutoSize = true;
    468       this.lblPreviewColumnsVariance.Location = new System.Drawing.Point(3, 3);
     521      this.lblPreviewColumnsVariance.Dock = System.Windows.Forms.DockStyle.Left;
     522      this.lblPreviewColumnsVariance.Location = new System.Drawing.Point(0, 0);
     523      this.lblPreviewColumnsVariance.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
    469524      this.lblPreviewColumnsVariance.Name = "lblPreviewColumnsVariance";
    470       this.lblPreviewColumnsVariance.Size = new System.Drawing.Size(301, 13);
     525      this.lblPreviewColumnsVariance.Size = new System.Drawing.Size(398, 17);
    471526      this.lblPreviewColumnsVariance.TabIndex = 2;
    472527      this.lblPreviewColumnsVariance.Text = "{0} columns with a variance smaller than {1} would be deleted.";
     
    476531      this.tabPreviewDeleteRowsInfo.Controls.Add(this.lblPreviewRowsInfo);
    477532      this.tabPreviewDeleteRowsInfo.Location = new System.Drawing.Point(4, 22);
     533      this.tabPreviewDeleteRowsInfo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
    478534      this.tabPreviewDeleteRowsInfo.Name = "tabPreviewDeleteRowsInfo";
    479       this.tabPreviewDeleteRowsInfo.Padding = new System.Windows.Forms.Padding(3);
    480       this.tabPreviewDeleteRowsInfo.Size = new System.Drawing.Size(711, 142);
     535      this.tabPreviewDeleteRowsInfo.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
     536      this.tabPreviewDeleteRowsInfo.Size = new System.Drawing.Size(951, 181);
    481537      this.tabPreviewDeleteRowsInfo.TabIndex = 2;
    482538      this.tabPreviewDeleteRowsInfo.Text = "del rows info";
     
    486542      //
    487543      this.lblPreviewRowsInfo.AutoSize = true;
    488       this.lblPreviewRowsInfo.Location = new System.Drawing.Point(3, 3);
     544      this.lblPreviewRowsInfo.Location = new System.Drawing.Point(4, 4);
     545      this.lblPreviewRowsInfo.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
    489546      this.lblPreviewRowsInfo.Name = "lblPreviewRowsInfo";
    490       this.lblPreviewRowsInfo.Size = new System.Drawing.Size(301, 13);
     547      this.lblPreviewRowsInfo.Size = new System.Drawing.Size(400, 17);
    491548      this.lblPreviewRowsInfo.TabIndex = 2;
    492549      this.lblPreviewRowsInfo.Text = "{0} rows with more than {1} % missing values would be deleted";
     
    496553      this.tabPreviewReplaceMissingValues.Controls.Add(this.lblPreviewReplaceMissingValues);
    497554      this.tabPreviewReplaceMissingValues.Location = new System.Drawing.Point(4, 22);
     555      this.tabPreviewReplaceMissingValues.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
    498556      this.tabPreviewReplaceMissingValues.Name = "tabPreviewReplaceMissingValues";
    499       this.tabPreviewReplaceMissingValues.Padding = new System.Windows.Forms.Padding(3);
    500       this.tabPreviewReplaceMissingValues.Size = new System.Drawing.Size(711, 142);
     557      this.tabPreviewReplaceMissingValues.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
     558      this.tabPreviewReplaceMissingValues.Size = new System.Drawing.Size(951, 181);
    501559      this.tabPreviewReplaceMissingValues.TabIndex = 6;
    502560      this.tabPreviewReplaceMissingValues.Text = "repl missing vals";
     
    506564      //
    507565      this.lblPreviewReplaceMissingValues.AutoSize = true;
    508       this.lblPreviewReplaceMissingValues.Location = new System.Drawing.Point(3, 3);
     566      this.lblPreviewReplaceMissingValues.Location = new System.Drawing.Point(4, 4);
     567      this.lblPreviewReplaceMissingValues.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
    509568      this.lblPreviewReplaceMissingValues.Name = "lblPreviewReplaceMissingValues";
    510       this.lblPreviewReplaceMissingValues.Size = new System.Drawing.Size(343, 13);
     569      this.lblPreviewReplaceMissingValues.Size = new System.Drawing.Size(449, 17);
    511570      this.lblPreviewReplaceMissingValues.TabIndex = 3;
    512571      this.lblPreviewReplaceMissingValues.Text = "{0} cells detected with missing values which would be replaced with {1}";
     
    516575      this.tabPreviewShuffle.Controls.Add(this.lblPreviewShuffle);
    517576      this.tabPreviewShuffle.Location = new System.Drawing.Point(4, 22);
     577      this.tabPreviewShuffle.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
    518578      this.tabPreviewShuffle.Name = "tabPreviewShuffle";
    519       this.tabPreviewShuffle.Padding = new System.Windows.Forms.Padding(3);
    520       this.tabPreviewShuffle.Size = new System.Drawing.Size(711, 142);
     579      this.tabPreviewShuffle.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
     580      this.tabPreviewShuffle.Size = new System.Drawing.Size(951, 181);
    521581      this.tabPreviewShuffle.TabIndex = 4;
    522582      this.tabPreviewShuffle.Text = "shuffle";
     
    526586      //
    527587      this.lblPreviewShuffle.AutoSize = true;
    528       this.lblPreviewShuffle.Location = new System.Drawing.Point(3, 3);
     588      this.lblPreviewShuffle.Location = new System.Drawing.Point(4, 4);
     589      this.lblPreviewShuffle.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
    529590      this.lblPreviewShuffle.Name = "lblPreviewShuffle";
    530       this.lblPreviewShuffle.Size = new System.Drawing.Size(252, 13);
     591      this.lblPreviewShuffle.Size = new System.Drawing.Size(337, 17);
    531592      this.lblPreviewShuffle.TabIndex = 0;
    532593      this.lblPreviewShuffle.Text = "Data will be shuffled randomly - preview not possible";
     
    539600      this.label9.TabIndex = 0;
    540601      //
    541       // shuffleSeparatelyCheckbox
    542       //
    543       this.shuffleSeparatelyCheckbox.AutoSize = true;
    544       this.shuffleSeparatelyCheckbox.Location = new System.Drawing.Point(6, 2);
    545       this.shuffleSeparatelyCheckbox.Name = "shuffleSeparatelyCheckbox";
    546       this.shuffleSeparatelyCheckbox.Size = new System.Drawing.Size(233, 17);
    547       this.shuffleSeparatelyCheckbox.TabIndex = 1;
    548       this.shuffleSeparatelyCheckbox.Text = "Shuffle training and test partitions separately";
    549       this.shuffleSeparatelyCheckbox.UseVisualStyleBackColor = true;
     602      // panel1
     603      //
     604      this.panel1.AutoScroll = true;
     605      this.panel1.Controls.Add(this.lblPreviewColumnsInfo);
     606      this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
     607      this.panel1.Location = new System.Drawing.Point(4, 4);
     608      this.panel1.Name = "panel1";
     609      this.panel1.Size = new System.Drawing.Size(943, 173);
     610      this.panel1.TabIndex = 2;
     611      //
     612      // panel2
     613      //
     614      this.panel2.AutoScroll = true;
     615      this.panel2.Controls.Add(this.lblPreviewColumnsVariance);
     616      this.panel2.Dock = System.Windows.Forms.DockStyle.Fill;
     617      this.panel2.Location = new System.Drawing.Point(4, 4);
     618      this.panel2.Name = "panel2";
     619      this.panel2.Size = new System.Drawing.Size(943, 173);
     620      this.panel2.TabIndex = 3;
    550621      //
    551622      // ManipulationView
    552623      //
    553       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
     624      this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
    554625      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
    555626      this.Controls.Add(this.btnApply);
     
    557628      this.Controls.Add(this.grpBoxData);
    558629      this.Controls.Add(this.lstMethods);
     630      this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
    559631      this.Name = "ManipulationView";
    560       this.Size = new System.Drawing.Size(739, 529);
     632      this.Size = new System.Drawing.Size(985, 651);
    561633      this.grpBoxData.ResumeLayout(false);
    562634      this.tabsData.ResumeLayout(false);
     
    578650      this.tabPreviewInactive.PerformLayout();
    579651      this.tabPreviewDeleteColumnsInfo.ResumeLayout(false);
    580       this.tabPreviewDeleteColumnsInfo.PerformLayout();
    581652      this.tabPreviewDeleteColumnsVariance.ResumeLayout(false);
    582653      this.tabPreviewDeleteColumnsVariance.PerformLayout();
     
    587658      this.tabPreviewShuffle.ResumeLayout(false);
    588659      this.tabPreviewShuffle.PerformLayout();
     660      this.panel1.ResumeLayout(false);
     661      this.panel1.PerformLayout();
     662      this.panel2.ResumeLayout(false);
     663      this.panel2.PerformLayout();
    589664      this.ResumeLayout(false);
    590665
     
    636711    private System.Windows.Forms.Label lblPreviewInActive;
    637712    private System.Windows.Forms.CheckBox shuffleSeparatelyCheckbox;
     713    private System.Windows.Forms.Panel panel1;
     714    private System.Windows.Forms.Panel panel2;
    638715  }
    639716}
  • branches/DataPreprocessingImprovements/HeuristicLab.DataPreprocessing.Views/3.4/ManipulationView.cs

    r12012 r12502  
    2323using System.Collections.Generic;
    2424using System.Drawing;
     25using System.Linq;
     26using System.Text;
    2527using System.Windows.Forms;
    2628using HeuristicLab.Core.Views;
     
    148150    private void validateDeleteColumnsInfo() {
    149151      validateDoubleTextBox(txtDeleteColumnsInfo.Text);
    150       if (btnApply.Enabled) {
    151         int count = Content.ManipulationLogic.ColumnsWithMissingValuesGreater(getDeleteColumnsInfo()).Count;
    152         int rowCount = Content.FilterLogic.PreprocessingData.Rows;
    153         lblPreviewColumnsInfo.Text = count + " column" + (count > 1 || count == 0 ? "s" : "") + " of " + rowCount + " (" + string.Format("{0:F2}%", 100d / rowCount * count) + ") were detected with more than " + txtDeleteColumnsInfo.Text + "% missing values.";
     152      if (btnApply.Enabled)
     153      {
     154        var filteredColumns = Content.ManipulationLogic.ColumnsWithMissingValuesGreater(getDeleteColumnsInfo());
     155        int count = filteredColumns.Count;
     156        int columnCount = Content.FilterLogic.PreprocessingData.Columns;
     157        lblPreviewColumnsInfo.Text = count + " column" + (count > 1 || count == 0 ? "s" : "") + " of " + columnCount + " (" + string.Format("{0:F2}%", 100d / columnCount * count) + ") were detected with more than " + txtDeleteColumnsInfo.Text + "% missing values.";
    154158        if (count > 0) {
    155           lblPreviewColumnsInfo.Text += Environment.NewLine + Environment.NewLine + "Please press the button \"Apply Manipulation\" if you wish to delete those columns.";
     159          StringBuilder sb = new StringBuilder();
     160          sb.Append(Environment.NewLine);
     161          sb.Append("Columns: ");
     162          sb.Append(Content.SearchLogic.VariableNames.ElementAt(filteredColumns.ElementAt(0)));
     163          for (int i = 1; i < filteredColumns.Count; i++) {
     164            string columnName = Content.SearchLogic.VariableNames.ElementAt(filteredColumns.ElementAt(i));
     165            sb.Append(", ");
     166            sb.Append(columnName);
     167          }
     168          sb.Append(Environment.NewLine);
     169          sb.Append("Please press the button \"Apply Manipulation\" if you wish to delete those columns.");
     170
     171          lblPreviewColumnsInfo.Text += sb.ToString();
    156172        } else {
    157173          btnApply.Enabled = false;
     
    165181      validateDoubleTextBox(txtDeleteColumnsVariance.Text);
    166182      if (btnApply.Enabled) {
    167         int count = Content.ManipulationLogic.ColumnsWithVarianceSmaller(getDeleteColumnsVariance()).Count;
    168         int rowCount = Content.FilterLogic.PreprocessingData.Rows;
    169         lblPreviewColumnsVariance.Text = count + " column" + (count > 1 || count == 0 ? "s" : "") + " of " + rowCount + " (" + string.Format("{0:F2}%", 100d / rowCount * count) + ") were detected with a variance smaller than " + txtDeleteColumnsVariance.Text + ".";
     183        var filteredColumns = Content.ManipulationLogic.ColumnsWithVarianceSmaller(getDeleteColumnsVariance());
     184        int count = filteredColumns.Count;
     185        int columnCount = Content.FilterLogic.PreprocessingData.Columns;
     186        lblPreviewColumnsVariance.Text = count + " column" + (count > 1 || count == 0 ? "s" : "") + " of " + columnCount + " (" + string.Format("{0:F2}%", 100d / columnCount * count) + ") were detected with a variance smaller than " + txtDeleteColumnsVariance.Text + ".";
    170187        if (count > 0) {
    171           lblPreviewColumnsVariance.Text += Environment.NewLine + Environment.NewLine + "Please press the button \"Apply Manipulation\" if you wish to delete those columns.";
     188          StringBuilder sb = new StringBuilder();
     189          sb.Append(Environment.NewLine);
     190          sb.Append("Columns: ");
     191          sb.Append(Content.SearchLogic.VariableNames.ElementAt(filteredColumns.ElementAt(0)));
     192          for (int i = 1; i < filteredColumns.Count; i++) {
     193            string columnName = Content.SearchLogic.VariableNames.ElementAt(filteredColumns.ElementAt(i));
     194            sb.Append(", ");
     195            sb.Append(columnName);
     196          }
     197          sb.Append(Environment.NewLine);
     198          sb.Append("Please press the button \"Apply Manipulation\" if you wish to delete those columns.");
     199
     200          lblPreviewColumnsVariance.Text += sb.ToString();
    172201        } else {
    173202          btnApply.Enabled = false;
Note: See TracChangeset for help on using the changeset viewer.