Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
08/27/13 16:27:15 (11 years ago)
Author:
ascheibe
Message:

#2031

  • redesigned statistical testing view
  • improved sample size influence view
Location:
branches/StatisticalTesting/HeuristicLab.Analysis.Statistics/3.3
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • branches/StatisticalTesting/HeuristicLab.Analysis.Statistics/3.3/SampleSizeInfluenceView.Designer.cs

    r9706 r9913  
    7373      this.xAxisLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
    7474      this.xAxisLabel.AutoSize = true;
    75       this.xAxisLabel.Location = new System.Drawing.Point(261, 256);
     75      this.xAxisLabel.Location = new System.Drawing.Point(139, 256);
    7676      this.xAxisLabel.Name = "xAxisLabel";
    77       this.xAxisLabel.Size = new System.Drawing.Size(15, 13);
     77      this.xAxisLabel.Size = new System.Drawing.Size(62, 13);
    7878      this.xAxisLabel.TabIndex = 12;
    79       this.xAxisLabel.Text = "x:";
     79      this.xAxisLabel.Text = "Group Size:";
    8080      //
    8181      // yAxisLabel
    … …  
    101101      // chart
    102102      //
    103       this.chart.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    104             | System.Windows.Forms.AnchorStyles.Left)
     103      this.chart.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
     104            | System.Windows.Forms.AnchorStyles.Left) 
    105105            | System.Windows.Forms.AnchorStyles.Right)));
    106106      chartArea1.Name = "ChartArea1";
    … …  
    159159      //
    160160      this.xAxisComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
    161       this.xAxisComboBox.Location = new System.Drawing.Point(282, 253);
     161      this.xAxisComboBox.Location = new System.Drawing.Point(207, 253);
    162162      this.xAxisComboBox.Name = "xAxisComboBox";
    163       this.xAxisComboBox.Size = new System.Drawing.Size(134, 20);
     163      this.xAxisComboBox.Size = new System.Drawing.Size(238, 20);
    164164      this.xAxisComboBox.TabIndex = 25;
    165165      this.xAxisComboBox.TextChanged += new System.EventHandler(this.xAxisComboBox_TextChanged);
    … …  
    168168      //
    169169      this.defineSampleSizeButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
    170       this.defineSampleSizeButton.Location = new System.Drawing.Point(422, 252);
     170      this.defineSampleSizeButton.Location = new System.Drawing.Point(451, 252);
    171171      this.defineSampleSizeButton.Name = "defineSampleSizeButton";
    172       this.defineSampleSizeButton.Size = new System.Drawing.Size(118, 21);
     172      this.defineSampleSizeButton.Size = new System.Drawing.Size(89, 21);
    173173      this.defineSampleSizeButton.TabIndex = 24;
    174       this.defineSampleSizeButton.Text = "Define Sample Size";
     174      this.defineSampleSizeButton.Text = "Set Group Size";
    175175      this.defineSampleSizeButton.UseVisualStyleBackColor = true;
    176176      this.defineSampleSizeButton.Click += new System.EventHandler(this.defineSampleSizeButton_Click);
    … …  
    193193      // statisticsGroupBox
    194194      //
    195       this.statisticsGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    196             | System.Windows.Forms.AnchorStyles.Left)
     195      this.statisticsGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
     196            | System.Windows.Forms.AnchorStyles.Left) 
    197197            | System.Windows.Forms.AnchorStyles.Right)));
    198198      this.statisticsGroupBox.Controls.Add(this.statisticsMatrixView);

  • branches/StatisticalTesting/HeuristicLab.Analysis.Statistics/3.3/StatisticalTestingView.cs

    r9911 r9913  
    2323using System.Collections.Generic;
    2424using System.Linq;
     25using System.Threading.Tasks;
    2526using System.Windows.Forms;
    2627using HeuristicLab.Core.Views;
    … …  
    3132
    3233namespace HeuristicLab.Analysis.Statistics {
    33   [View("Statistical Testing")]
     34  [View("Statistical Tests")]
    3435  [Content(typeof(RunCollection), false)]
    3536  public sealed partial class StatisticalTestingView : ItemView {
    … …  
    6364
    6465    private void UpdateCaption() {
    65       Caption = Content != null ? Content.OptimizerName + " Statistical Testing" : ViewAttribute.GetViewName(GetType());
     66      Caption = Content != null ? Content.OptimizerName + " Statistical Tests" : ViewAttribute.GetViewName(GetType());
    6667    }
    6768
    … …  
    223224    }
    224225
    225     private void testButton_Click(object sender, EventArgs e) {
     226    private void resultComboBox_SelectedValueChanged(object sender, EventArgs e) {
     227      RebuildDataTable();
     228      ResetUI();
     229      CalculateValues();
     230    }
     231
     232    private void groupComboBox_SelectedValueChanged(object sender, EventArgs e) {
     233      FillCompComboBox();
     234      RebuildDataTable();
     235      ResetUI();
     236      CalculateValues();
     237    }
     238
     239    private void CalculateValues() {
     240      MainFormManager.GetMainForm<HeuristicLab.MainForm.WindowsForms.MainForm>().AddOperationProgressToView(this, "Calculating...");
     241      Task.Factory.StartNew(CalculateValuesAsync);
     242    }
     243
     244    private void CalculateValuesAsync() {
     245      TestAllGroups();
     246      CalculateNormality();
     247      CalculateNormalityDetails();
     248      CalculatePairwiseTest();
     249      CalculatePairwiseTestDetails();
     250
     251      MainFormManager.GetMainForm<HeuristicLab.MainForm.WindowsForms.MainForm>().RemoveOperationProgressFromView(this);
     252    }
     253
     254    private void CalculatePairwise() {
     255      MainFormManager.GetMainForm<HeuristicLab.MainForm.WindowsForms.MainForm>().AddOperationProgressToView(this, "Calculating...");
     256      Task.Factory.StartNew(CalculatePairwiseAsync);
     257    }
     258
     259    private void CalculatePairwiseAsync() {
     260      CalculatePairwiseTest();
     261      CalculatePairwiseTestDetails();
     262
     263      MainFormManager.GetMainForm<HeuristicLab.MainForm.WindowsForms.MainForm>().RemoveOperationProgressFromView(this);
     264    }
     265
     266    private void TestAllGroups() {
    226267      double pval = KruskalWallis.Test(data);
    227268      pValTextBox.Text = pval.ToString();
    228269      if (pval < 0.05) {
    229         groupCompLabel.Image = HeuristicLab.Analysis.Statistics.Resources.Default;
     270        this.Invoke(new Action(() => { groupCompLabel.Image = HeuristicLab.Analysis.Statistics.Resources.Default; }));
    230271      } else {
    231         groupCompLabel.Image = HeuristicLab.Common.Resources.VSImageLibrary.Warning;
    232       }
    233     }
    234 
    235     private void normalDistButton_Click(object sender, EventArgs e) {
     272        this.Invoke(new Action(() => { groupCompLabel.Image = HeuristicLab.Common.Resources.VSImageLibrary.Warning; }));
     273      }
     274    }
     275
     276    private void CalculateNormality() {
    236277      double val;
    237278      List<double> res = new List<double>();
    … …  
    244285      for (int i = 0; i < res.Count(); i++) {
    245286        if (res[i] < 0.1) {
    246           normalityLabel.Image = HeuristicLab.Common.Resources.VSImageLibrary.Warning;
     287          this.Invoke(new Action(() => { normalityLabel.Image = HeuristicLab.Common.Resources.VSImageLibrary.Warning; }));
    247288        } else {
    248           normalityLabel.Image = HeuristicLab.Analysis.Statistics.Resources.Default;
    249         }
    250       }
    251     }
    252 
    253     private void resultComboBox_SelectedValueChanged(object sender, EventArgs e) {
    254       RebuildDataTable();
    255       ResetUI();
    256     }
    257 
    258     private void groupComboBox_SelectedValueChanged(object sender, EventArgs e) {
    259       FillCompComboBox();
    260       RebuildDataTable();
    261       ResetUI();
    262     }
    263 
    264     private void normalityDetails_Click(object sender, EventArgs e) {
     289          this.Invoke(new Action(() => { normalityLabel.Image = HeuristicLab.Analysis.Statistics.Resources.Default; }));
     290        }
     291      }
     292    }
     293
     294    private void CalculateNormalityDetails() {
    265295      DoubleMatrix pValsMatrix = new DoubleMatrix(1, stringConvertibleMatrixView.Content.Columns);
    266296      pValsMatrix.ColumnNames = stringConvertibleMatrixView.Content.ColumnNames;
    … …  
    273303      }
    274304
    275       MainFormManager.MainForm.ShowContent(pValsMatrix);
    276     }
    277 
    278     private void pairwiseTestButton_Click(object sender, EventArgs e) {
     305      this.Invoke(new Action(() => { normalityStringConvertibleMatrixView.Content = pValsMatrix; }));
     306    }
     307
     308    private void CalculatePairwiseTest() {
     309      string curItem = (string)groupCompComboBox.SelectedItem;
     310      int colIndex = 0;
     311
     312      foreach (string col in stringConvertibleMatrixView.Content.ColumnNames) {
     313        if (col == curItem) {
     314          break;
     315        }
     316        colIndex++;
     317      }
     318
     319      double mwuBothtails;
     320      double mwuLefttail;
     321      double mwuRighttail;
     322      int cnt = 0;
     323
     324      for (int i = 0; i < data.Length; i++) {
     325        if (i != colIndex) {
     326          alglib.mannwhitneyutest(data[colIndex], data[colIndex].Length, data[i], data[i].Length, out mwuBothtails, out mwuLefttail, out mwuRighttail);
     327          if (mwuBothtails > 0.05) {
     328            cnt++;
     329          }
     330        }
     331      }
     332
     333      double ratio = ((double)cnt) / (data.Length - 1) * 100.0;
     334      equalDistsTextBox.Text = ratio.ToString() + " %";
     335
     336      if (cnt == 0) {
     337        this.Invoke(new Action(() => { pairwiseLabel.Image = HeuristicLab.Analysis.Statistics.Resources.Default; }));
     338      } else {
     339        this.Invoke(new Action(() => { pairwiseLabel.Image = HeuristicLab.Common.Resources.VSImageLibrary.Warning; }));
     340      }
     341    }
     342
     343    private void CalculatePairwiseTestDetails() {
    279344      string curItem = (string)groupCompComboBox.SelectedItem;
    280345      int colIndex = 0;
    … …  
    305370      }
    306371
    307       MainFormManager.MainForm.ShowContent(pValsMatrix);
     372      this.Invoke(new Action(() => { pairwiseStringConvertibleMatrixView.Content = pValsMatrix; }));
    308373    }
    309374
    … …  
    323388    }
    324389
    325     private void pairwiseCheckDataButton_Click(object sender, EventArgs e) {
    326       string curItem = (string)groupCompComboBox.SelectedItem;
    327       int colIndex = 0;
    328 
    329       foreach (string col in stringConvertibleMatrixView.Content.ColumnNames) {
    330         if (col == curItem) {
    331           break;
    332         }
    333         colIndex++;
    334       }
    335 
    336       double mwuBothtails;
    337       double mwuLefttail;
    338       double mwuRighttail;
    339       int cnt = 0;
    340 
    341       for (int i = 0; i < data.Length; i++) {
    342         if (i != colIndex) {
    343           alglib.mannwhitneyutest(data[colIndex], data[colIndex].Length, data[i], data[i].Length, out mwuBothtails, out mwuLefttail, out mwuRighttail);
    344           if (mwuBothtails > 0.05) {
    345             cnt++;
    346           }
    347         }
    348       }
    349 
    350       double ratio = ((double)cnt) / (data.Length - 1) * 100.0;
    351       equalDistsTextBox.Text = ratio.ToString() + " %";
    352 
    353       if (cnt == 0) {
    354         pairwiseLabel.Image = HeuristicLab.Analysis.Statistics.Resources.Default;
    355       } else {
    356         pairwiseLabel.Image = HeuristicLab.Common.Resources.VSImageLibrary.Warning;
    357       }
     390    private void groupCompComboBox_SelectedValueChanged(object sender, EventArgs e) {
     391      CalculatePairwise();
    358392    }
    359393  }

  • branches/StatisticalTesting/HeuristicLab.Analysis.Statistics/3.3/StatisticalTestingView.designer.cs

    r9908 r9913  
    5353      this.label1 = new System.Windows.Forms.Label();
    5454      this.resultComboBox = new System.Windows.Forms.ComboBox();
    55       this.testButton = new System.Windows.Forms.Button();
    56       this.normalDistButton = new System.Windows.Forms.Button();
    5755      this.lblPVal = new System.Windows.Forms.Label();
    5856      this.pValTextBox = new System.Windows.Forms.TextBox();
    5957      this.groupComboBox = new System.Windows.Forms.ComboBox();
    60       this.normalityDetails = new System.Windows.Forms.Button();
    61       this.pairwiseTestButton = new System.Windows.Forms.Button();
    6258      this.infoLabel = new System.Windows.Forms.Label();
    6359      this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
    … …  
    6561      this.splitContainer3 = new System.Windows.Forms.SplitContainer();
    6662      this.pairwiseTestGroupBox = new System.Windows.Forms.GroupBox();
     63      this.pairwiseStringConvertibleMatrixView = new HeuristicLab.Data.Views.StringConvertibleMatrixView();
    6764      this.pairwiseLabel = new System.Windows.Forms.Label();
    6865      this.label3 = new System.Windows.Forms.Label();
    6966      this.equalDistsTextBox = new System.Windows.Forms.TextBox();
    70       this.pairwiseCheckDataButton = new System.Windows.Forms.Button();
    7167      this.label2 = new System.Windows.Forms.Label();
    7268      this.groupCompComboBox = new System.Windows.Forms.ComboBox();
    … …  
    7470      this.groupCompLabel = new System.Windows.Forms.Label();
    7571      this.normalityGroupBox = new System.Windows.Forms.GroupBox();
     72      this.label4 = new System.Windows.Forms.Label();
     73      this.normalityStringConvertibleMatrixView = new HeuristicLab.Data.Views.StringConvertibleMatrixView();
    7674      this.normalityLabel = new System.Windows.Forms.Label();
    7775      this.selectDataGroupBox = new System.Windows.Forms.GroupBox();
    … …  
    104102      this.stringConvertibleMatrixView.ShowRowsAndColumnsTextBox = false;
    105103      this.stringConvertibleMatrixView.ShowStatisticalInformation = true;
    106       this.stringConvertibleMatrixView.Size = new System.Drawing.Size(644, 416);
     104      this.stringConvertibleMatrixView.Size = new System.Drawing.Size(674, 534);
    107105      this.stringConvertibleMatrixView.TabIndex = 0;
    108106      //
    … …  
    147145      this.resultComboBox.Location = new System.Drawing.Point(62, 3);
    148146      this.resultComboBox.Name = "resultComboBox";
    149       this.resultComboBox.Size = new System.Drawing.Size(176, 21);
     147      this.resultComboBox.Size = new System.Drawing.Size(311, 21);
    150148      this.resultComboBox.TabIndex = 5;
    151149      this.resultComboBox.SelectedValueChanged += new System.EventHandler(this.resultComboBox_SelectedValueChanged);
    152150      //
    153       // testButton
    154       //
    155       this.testButton.Location = new System.Drawing.Point(6, 19);
    156       this.testButton.Name = "testButton";
    157       this.testButton.Size = new System.Drawing.Size(92, 23);
    158       this.testButton.TabIndex = 9;
    159       this.testButton.Text = "Test all Groups";
    160       this.testButton.UseVisualStyleBackColor = true;
    161       this.testButton.Click += new System.EventHandler(this.testButton_Click);
    162       //
    163       // normalDistButton
    164       //
    165       this.normalDistButton.Location = new System.Drawing.Point(6, 19);
    166       this.normalDistButton.Name = "normalDistButton";
    167       this.normalDistButton.Size = new System.Drawing.Size(92, 23);
    168       this.normalDistButton.TabIndex = 11;
    169       this.normalDistButton.Text = "Check Data";
    170       this.normalDistButton.UseVisualStyleBackColor = true;
    171       this.normalDistButton.Click += new System.EventHandler(this.normalDistButton_Click);
    172       //
    173151      // lblPVal
    174152      //
    175153      this.lblPVal.AutoSize = true;
    176       this.lblPVal.Location = new System.Drawing.Point(6, 51);
     154      this.lblPVal.Location = new System.Drawing.Point(6, 22);
    177155      this.lblPVal.Name = "lblPVal";
    178156      this.lblPVal.Size = new System.Drawing.Size(46, 13);
    … …  
    185163      this.pValTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    186164            | System.Windows.Forms.AnchorStyles.Right)));
    187       this.pValTextBox.Location = new System.Drawing.Point(58, 48);
     165      this.pValTextBox.Location = new System.Drawing.Point(58, 19);
    188166      this.pValTextBox.Name = "pValTextBox";
    189167      this.pValTextBox.ReadOnly = true;
    190       this.pValTextBox.Size = new System.Drawing.Size(189, 20);
     168      this.pValTextBox.Size = new System.Drawing.Size(302, 20);
    191169      this.pValTextBox.TabIndex = 13;
    192170      //
    … …  
    199177      this.groupComboBox.Location = new System.Drawing.Point(62, 3);
    200178      this.groupComboBox.Name = "groupComboBox";
    201       this.groupComboBox.Size = new System.Drawing.Size(176, 21);
     179      this.groupComboBox.Size = new System.Drawing.Size(311, 21);
    202180      this.groupComboBox.TabIndex = 14;
    203181      this.groupComboBox.SelectedValueChanged += new System.EventHandler(this.groupComboBox_SelectedValueChanged);
    204182      //
    205       // normalityDetails
    206       //
    207       this.normalityDetails.Location = new System.Drawing.Point(6, 48);
    208       this.normalityDetails.Name = "normalityDetails";
    209       this.normalityDetails.Size = new System.Drawing.Size(92, 23);
    210       this.normalityDetails.TabIndex = 15;
    211       this.normalityDetails.Text = "Show Details";
    212       this.normalityDetails.UseVisualStyleBackColor = true;
    213       this.normalityDetails.Click += new System.EventHandler(this.normalityDetails_Click);
    214       //
    215       // pairwiseTestButton
    216       //
    217       this.pairwiseTestButton.Location = new System.Drawing.Point(6, 113);
    218       this.pairwiseTestButton.Name = "pairwiseTestButton";
    219       this.pairwiseTestButton.Size = new System.Drawing.Size(92, 23);
    220       this.pairwiseTestButton.TabIndex = 16;
    221       this.pairwiseTestButton.Text = "Show Details";
    222       this.pairwiseTestButton.UseVisualStyleBackColor = true;
    223       this.pairwiseTestButton.Click += new System.EventHandler(this.pairwiseTestButton_Click);
    224       //
    225183      // infoLabel
    226184      //
    227185      this.infoLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
    228186      this.infoLabel.Image = ((System.Drawing.Image)(resources.GetObject("infoLabel.Image")));
    229       this.infoLabel.Location = new System.Drawing.Point(234, 3);
     187      this.infoLabel.Location = new System.Drawing.Point(369, 3);
    230188      this.infoLabel.Name = "infoLabel";
    231189      this.infoLabel.Size = new System.Drawing.Size(16, 16);
    … …  
    252210      this.splitContainer1.Panel2.Controls.Add(this.groupByLabel);
    253211      this.splitContainer1.Panel2.Controls.Add(this.groupComboBox);
    254       this.splitContainer1.Size = new System.Drawing.Size(241, 54);
     212      this.splitContainer1.Size = new System.Drawing.Size(376, 54);
    255213      this.splitContainer1.SplitterDistance = 25;
    256214      this.splitContainer1.TabIndex = 18;
    … …  
    275233      this.splitContainer3.Panel2.Controls.Add(this.normalityGroupBox);
    276234      this.splitContainer3.Panel2.Controls.Add(this.selectDataGroupBox);
    277       this.splitContainer3.Size = new System.Drawing.Size(913, 422);
    278       this.splitContainer3.SplitterDistance = 650;
     235      this.splitContainer3.Size = new System.Drawing.Size(1078, 540);
     236      this.splitContainer3.SplitterDistance = 680;
    279237      this.splitContainer3.TabIndex = 20;
    280238      //
    281239      // pairwiseTestGroupBox
    282240      //
    283       this.pairwiseTestGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    284             | System.Windows.Forms.AnchorStyles.Right)));
     241      this.pairwiseTestGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     242            | System.Windows.Forms.AnchorStyles.Left)
     243            | System.Windows.Forms.AnchorStyles.Right)));
     244      this.pairwiseTestGroupBox.Controls.Add(this.pairwiseStringConvertibleMatrixView);
    285245      this.pairwiseTestGroupBox.Controls.Add(this.pairwiseLabel);
    286246      this.pairwiseTestGroupBox.Controls.Add(this.label3);
    287247      this.pairwiseTestGroupBox.Controls.Add(this.equalDistsTextBox);
    288       this.pairwiseTestGroupBox.Controls.Add(this.pairwiseCheckDataButton);
    289248      this.pairwiseTestGroupBox.Controls.Add(this.label2);
    290249      this.pairwiseTestGroupBox.Controls.Add(this.groupCompComboBox);
    291       this.pairwiseTestGroupBox.Controls.Add(this.pairwiseTestButton);
    292       this.pairwiseTestGroupBox.Location = new System.Drawing.Point(3, 273);
     250      this.pairwiseTestGroupBox.Location = new System.Drawing.Point(3, 308);
    293251      this.pairwiseTestGroupBox.Name = "pairwiseTestGroupBox";
    294       this.pairwiseTestGroupBox.Size = new System.Drawing.Size(253, 145);
     252      this.pairwiseTestGroupBox.Size = new System.Drawing.Size(388, 229);
    295253      this.pairwiseTestGroupBox.TabIndex = 22;
    296254      this.pairwiseTestGroupBox.TabStop = false;
    297255      this.pairwiseTestGroupBox.Text = "4. Pairwise Statistical Testing";
    298256      //
     257      // pairwiseStringConvertibleMatrixView
     258      //
     259      this.pairwiseStringConvertibleMatrixView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     260            | System.Windows.Forms.AnchorStyles.Left)
     261            | System.Windows.Forms.AnchorStyles.Right)));
     262      this.pairwiseStringConvertibleMatrixView.Caption = "StringConvertibleMatrix View";
     263      this.pairwiseStringConvertibleMatrixView.Content = null;
     264      this.pairwiseStringConvertibleMatrixView.Location = new System.Drawing.Point(6, 72);
     265      this.pairwiseStringConvertibleMatrixView.Name = "pairwiseStringConvertibleMatrixView";
     266      this.pairwiseStringConvertibleMatrixView.ReadOnly = false;
     267      this.pairwiseStringConvertibleMatrixView.ShowRowsAndColumnsTextBox = false;
     268      this.pairwiseStringConvertibleMatrixView.ShowStatisticalInformation = false;
     269      this.pairwiseStringConvertibleMatrixView.Size = new System.Drawing.Size(376, 151);
     270      this.pairwiseStringConvertibleMatrixView.TabIndex = 19;
     271      //
    299272      // pairwiseLabel
    300273      //
     274      this.pairwiseLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
    301275      this.pairwiseLabel.AutoSize = true;
    302       this.pairwiseLabel.Location = new System.Drawing.Point(101, 57);
     276      this.pairwiseLabel.Location = new System.Drawing.Point(366, 43);
    303277      this.pairwiseLabel.MaximumSize = new System.Drawing.Size(16, 16);
    304278      this.pairwiseLabel.MinimumSize = new System.Drawing.Size(16, 16);
    … …  
    310284      //
    311285      this.label3.AutoSize = true;
    312       this.label3.Location = new System.Drawing.Point(9, 90);
     286      this.label3.Location = new System.Drawing.Point(6, 49);
    313287      this.label3.Name = "label3";
    314288      this.label3.Size = new System.Drawing.Size(74, 13);
    … …  
    321295      this.equalDistsTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    322296            | System.Windows.Forms.AnchorStyles.Right)));
    323       this.equalDistsTextBox.Location = new System.Drawing.Point(95, 87);
     297      this.equalDistsTextBox.Location = new System.Drawing.Point(86, 46);
    324298      this.equalDistsTextBox.Name = "equalDistsTextBox";
    325299      this.equalDistsTextBox.ReadOnly = true;
    326       this.equalDistsTextBox.Size = new System.Drawing.Size(152, 20);
     300      this.equalDistsTextBox.Size = new System.Drawing.Size(274, 20);
    327301      this.equalDistsTextBox.TabIndex = 18;
    328       //
    329       // pairwiseCheckDataButton
    330       //
    331       this.pairwiseCheckDataButton.Location = new System.Drawing.Point(6, 52);
    332       this.pairwiseCheckDataButton.Name = "pairwiseCheckDataButton";
    333       this.pairwiseCheckDataButton.Size = new System.Drawing.Size(92, 23);
    334       this.pairwiseCheckDataButton.TabIndex = 19;
    335       this.pairwiseCheckDataButton.Text = "Check Data";
    336       this.pairwiseCheckDataButton.UseVisualStyleBackColor = true;
    337       this.pairwiseCheckDataButton.Click += new System.EventHandler(this.pairwiseCheckDataButton_Click);
    338302      //
    339303      // label2
    … …  
    354318      this.groupCompComboBox.Location = new System.Drawing.Point(123, 19);
    355319      this.groupCompComboBox.Name = "groupCompComboBox";
    356       this.groupCompComboBox.Size = new System.Drawing.Size(124, 21);
     320      this.groupCompComboBox.Size = new System.Drawing.Size(259, 21);
    357321      this.groupCompComboBox.TabIndex = 17;
     322      this.groupCompComboBox.SelectedValueChanged += new System.EventHandler(this.groupCompComboBox_SelectedValueChanged);
    358323      //
    359324      // allGroupTestGroupBox
    … …  
    362327            | System.Windows.Forms.AnchorStyles.Right)));
    363328      this.allGroupTestGroupBox.Controls.Add(this.groupCompLabel);
    364       this.allGroupTestGroupBox.Controls.Add(this.testButton);
    365329      this.allGroupTestGroupBox.Controls.Add(this.lblPVal);
    366330      this.allGroupTestGroupBox.Controls.Add(this.pValTextBox);
    367       this.allGroupTestGroupBox.Location = new System.Drawing.Point(3, 189);
     331      this.allGroupTestGroupBox.Location = new System.Drawing.Point(3, 256);
    368332      this.allGroupTestGroupBox.Name = "allGroupTestGroupBox";
    369       this.allGroupTestGroupBox.Size = new System.Drawing.Size(253, 78);
     333      this.allGroupTestGroupBox.Size = new System.Drawing.Size(388, 46);
    370334      this.allGroupTestGroupBox.TabIndex = 21;
    371335      this.allGroupTestGroupBox.TabStop = false;
    … …  
    374338      // groupCompLabel
    375339      //
     340      this.groupCompLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
    376341      this.groupCompLabel.AutoSize = true;
    377       this.groupCompLabel.Location = new System.Drawing.Point(104, 24);
     342      this.groupCompLabel.Location = new System.Drawing.Point(366, 22);
    378343      this.groupCompLabel.MaximumSize = new System.Drawing.Size(16, 16);
    379344      this.groupCompLabel.MinimumSize = new System.Drawing.Size(16, 16);
    … …  
    386351      this.normalityGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    387352            | System.Windows.Forms.AnchorStyles.Right)));
     353      this.normalityGroupBox.Controls.Add(this.label4);
     354      this.normalityGroupBox.Controls.Add(this.normalityStringConvertibleMatrixView);
    388355      this.normalityGroupBox.Controls.Add(this.normalityLabel);
    389       this.normalityGroupBox.Controls.Add(this.normalDistButton);
    390       this.normalityGroupBox.Controls.Add(this.normalityDetails);
    391356      this.normalityGroupBox.Location = new System.Drawing.Point(3, 107);
    392357      this.normalityGroupBox.Name = "normalityGroupBox";
    393       this.normalityGroupBox.Size = new System.Drawing.Size(253, 76);
     358      this.normalityGroupBox.Size = new System.Drawing.Size(388, 143);
    394359      this.normalityGroupBox.TabIndex = 20;
    395360      this.normalityGroupBox.TabStop = false;
    396361      this.normalityGroupBox.Text = "2. Check for Normal Distribution";
    397362      //
     363      // label4
     364      //
     365      this.label4.AutoSize = true;
     366      this.label4.Location = new System.Drawing.Point(6, 16);
     367      this.label4.Name = "label4";
     368      this.label4.Size = new System.Drawing.Size(135, 13);
     369      this.label4.TabIndex = 18;
     370      this.label4.Text = "Data is normally distributed:";
     371      //
     372      // normalityStringConvertibleMatrixView
     373      //
     374      this.normalityStringConvertibleMatrixView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     375            | System.Windows.Forms.AnchorStyles.Left)
     376            | System.Windows.Forms.AnchorStyles.Right)));
     377      this.normalityStringConvertibleMatrixView.Caption = "StringConvertibleMatrix View";
     378      this.normalityStringConvertibleMatrixView.Content = null;
     379      this.normalityStringConvertibleMatrixView.Location = new System.Drawing.Point(6, 35);
     380      this.normalityStringConvertibleMatrixView.Name = "normalityStringConvertibleMatrixView";
     381      this.normalityStringConvertibleMatrixView.ReadOnly = false;
     382      this.normalityStringConvertibleMatrixView.ShowRowsAndColumnsTextBox = false;
     383      this.normalityStringConvertibleMatrixView.ShowStatisticalInformation = false;
     384      this.normalityStringConvertibleMatrixView.Size = new System.Drawing.Size(373, 102);
     385      this.normalityStringConvertibleMatrixView.TabIndex = 17;
     386      //
    398387      // normalityLabel
    399388      //
    400389      this.normalityLabel.AutoSize = true;
    401       this.normalityLabel.Location = new System.Drawing.Point(104, 24);
     390      this.normalityLabel.Location = new System.Drawing.Point(156, 16);
    402391      this.normalityLabel.MaximumSize = new System.Drawing.Size(16, 16);
    403392      this.normalityLabel.MinimumSize = new System.Drawing.Size(16, 16);
    … …  
    413402      this.selectDataGroupBox.Location = new System.Drawing.Point(3, 22);
    414403      this.selectDataGroupBox.Name = "selectDataGroupBox";
    415       this.selectDataGroupBox.Size = new System.Drawing.Size(253, 79);
     404      this.selectDataGroupBox.Size = new System.Drawing.Size(388, 79);
    416405      this.selectDataGroupBox.TabIndex = 19;
    417406      this.selectDataGroupBox.TabStop = false;
    … …  
    422411      this.Controls.Add(this.splitContainer3);
    423412      this.Name = "StatisticalTestingView";
    424       this.Size = new System.Drawing.Size(924, 428);
     413      this.Size = new System.Drawing.Size(1089, 546);
    425414      this.contextMenuStrip1.ResumeLayout(false);
    426415      this.splitContainer1.Panel1.ResumeLayout(false);
    … …  
    450439    private System.Windows.Forms.Label label1;
    451440    private System.Windows.Forms.ComboBox resultComboBox;
    452     private System.Windows.Forms.Button testButton;
    453     private System.Windows.Forms.Button normalDistButton;
    454441    private System.Windows.Forms.Label lblPVal;
    455442    private System.Windows.Forms.TextBox pValTextBox;
    456443    private System.Windows.Forms.ComboBox groupComboBox;
    457     private System.Windows.Forms.Button normalityDetails;
    458     private System.Windows.Forms.Button pairwiseTestButton;
    459444    private System.Windows.Forms.Label infoLabel;
    460445    private System.Windows.Forms.ToolTip toolTip1;
    … …  
    471456    private System.Windows.Forms.Label label2;
    472457    private System.Windows.Forms.ComboBox groupCompComboBox;
    473     private System.Windows.Forms.Button pairwiseCheckDataButton;
    474458    private System.Windows.Forms.Label label3;
    475459    private System.Windows.Forms.TextBox equalDistsTextBox;
    476460    private System.Windows.Forms.Label pairwiseLabel;
     461    private Data.Views.StringConvertibleMatrixView normalityStringConvertibleMatrixView;
     462    private Data.Views.StringConvertibleMatrixView pairwiseStringConvertibleMatrixView;
     463    private System.Windows.Forms.Label label4;
    477464  }
    478465}
Note: See TracChangeset for help on using the changeset viewer.