Changeset 11601


Ignore:
Timestamp:
11/28/14 16:13:59 (8 years ago)
Author:
ascheibe
Message:

#2031

  • fixed column width of p-values
  • started working on drawing a normal distribution over the histogram
Location:
branches/StatisticalTesting/HeuristicLab.Analysis.Statistics/3.3
Files:
2 added
3 edited

Legend:

Unmodified
Added
Removed
  • branches/StatisticalTesting/HeuristicLab.Analysis.Statistics/3.3/HeuristicLab.Analysis.Statistics-3.3.csproj

    r9998 r11601  
    120120  <ItemGroup>
    121121    <Compile Include="BonferroniHolm.cs" />
     122    <Compile Include="DensityDataTableView.cs">
     123      <SubType>UserControl</SubType>
     124    </Compile>
    122125    <Compile Include="EnumerableStatisticsExtension.cs" />
    123126    <Compile Include="ExpFitting.cs" />
    124127    <Compile Include="IFitting.cs" />
     128    <Compile Include="NormalDistribution.cs" />
    125129    <Compile Include="LinearLeastSquaresFitting.cs" />
    126130    <Compile Include="LogFitting.cs" />
  • branches/StatisticalTesting/HeuristicLab.Analysis.Statistics/3.3/StatisticalTestingView.cs

    r11375 r11601  
    333333      }
    334334
    335       this.Invoke(new Action(() => { normalityStringConvertibleMatrixView.Content = pValsMatrix; }));
     335      this.Invoke(new Action(() => {
     336        normalityStringConvertibleMatrixView.Content = pValsMatrix;
     337        normalityStringConvertibleMatrixView.DataGridView.AutoResizeColumns(DataGridViewAutoSizeColumnsMode.AllCells);
     338      }));
    336339    }
    337340
     
    459462      }
    460463
    461       this.Invoke(new Action(() => { pairwiseStringConvertibleMatrixView.Content = pValsMatrix; }));
     464      this.Invoke(new Action(() => {
     465        pairwiseStringConvertibleMatrixView.Content = pValsMatrix;
     466        pairwiseStringConvertibleMatrixView.DataGridView.AutoResizeColumns(DataGridViewAutoSizeColumnsMode.AllCells);
     467      }));
    462468    }
    463469
  • branches/StatisticalTesting/HeuristicLab.Analysis.Statistics/3.3/StatisticalTestingView.designer.cs

    r11375 r11601  
    7474      this.tabPage1 = new System.Windows.Forms.TabPage();
    7575      this.tabPage2 = new System.Windows.Forms.TabPage();
    76       this.dataTableView = new HeuristicLab.Analysis.Views.DataTableView();
     76      this.dataTableView = new DensityDataTableView();
    7777      this.contextMenuStrip1.SuspendLayout();
    7878      ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
     
    9595      // stringConvertibleMatrixView
    9696      //
    97       this.stringConvertibleMatrixView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
    98             | System.Windows.Forms.AnchorStyles.Left) 
     97      this.stringConvertibleMatrixView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     98            | System.Windows.Forms.AnchorStyles.Left)
    9999            | System.Windows.Forms.AnchorStyles.Right)));
    100100      this.stringConvertibleMatrixView.Caption = "StringConvertibleMatrix View";
     
    145145      // resultComboBox
    146146      //
    147       this.resultComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
     147      this.resultComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    148148            | System.Windows.Forms.AnchorStyles.Right)));
    149149      this.resultComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
     
    169169      // pValTextBox
    170170      //
    171       this.pValTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
     171      this.pValTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    172172            | System.Windows.Forms.AnchorStyles.Right)));
    173173      this.pValTextBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
     
    180180      // groupComboBox
    181181      //
    182       this.groupComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
     182      this.groupComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    183183            | System.Windows.Forms.AnchorStyles.Right)));
    184184      this.groupComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
     
    193193      // splitContainer1
    194194      //
    195       this.splitContainer1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
    196             | System.Windows.Forms.AnchorStyles.Left) 
     195      this.splitContainer1.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.splitContainer1.Location = new System.Drawing.Point(6, 19);
     
    215215      // splitContainer3
    216216      //
    217       this.splitContainer3.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
    218             | System.Windows.Forms.AnchorStyles.Left) 
     217      this.splitContainer3.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     218            | System.Windows.Forms.AnchorStyles.Left)
    219219            | System.Windows.Forms.AnchorStyles.Right)));
    220220      this.splitContainer3.Location = new System.Drawing.Point(6, 6);
     
    237237      // pairwiseTestGroupBox
    238238      //
    239       this.pairwiseTestGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
    240             | System.Windows.Forms.AnchorStyles.Left) 
     239      this.pairwiseTestGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     240            | System.Windows.Forms.AnchorStyles.Left)
    241241            | System.Windows.Forms.AnchorStyles.Right)));
    242242      this.pairwiseTestGroupBox.Controls.Add(this.pairwiseStringConvertibleMatrixView);
     
    256256      // pairwiseStringConvertibleMatrixView
    257257      //
    258       this.pairwiseStringConvertibleMatrixView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
    259             | System.Windows.Forms.AnchorStyles.Left) 
     258      this.pairwiseStringConvertibleMatrixView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     259            | System.Windows.Forms.AnchorStyles.Left)
    260260            | System.Windows.Forms.AnchorStyles.Right)));
    261261      this.pairwiseStringConvertibleMatrixView.Caption = "StringConvertibleMatrix View";
     
    294294      // equalDistsTextBox
    295295      //
    296       this.equalDistsTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
     296      this.equalDistsTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    297297            | System.Windows.Forms.AnchorStyles.Right)));
    298298      this.equalDistsTextBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
     
    315315      // groupCompComboBox
    316316      //
    317       this.groupCompComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
     317      this.groupCompComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    318318            | System.Windows.Forms.AnchorStyles.Right)));
    319319      this.groupCompComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
     
    328328      // allGroupTestGroupBox
    329329      //
    330       this.allGroupTestGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
     330      this.allGroupTestGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    331331            | System.Windows.Forms.AnchorStyles.Right)));
    332332      this.allGroupTestGroupBox.Controls.Add(this.groupCompLabel);
     
    354354      // normalityGroupBox
    355355      //
    356       this.normalityGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
     356      this.normalityGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    357357            | System.Windows.Forms.AnchorStyles.Right)));
    358358      this.normalityGroupBox.Controls.Add(this.label4);
     
    379379      // normalityStringConvertibleMatrixView
    380380      //
    381       this.normalityStringConvertibleMatrixView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
    382             | System.Windows.Forms.AnchorStyles.Left) 
     381      this.normalityStringConvertibleMatrixView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     382            | System.Windows.Forms.AnchorStyles.Left)
    383383            | System.Windows.Forms.AnchorStyles.Right)));
    384384      this.normalityStringConvertibleMatrixView.Caption = "StringConvertibleMatrix View";
     
    405405      // selectDataGroupBox
    406406      //
    407       this.selectDataGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
     407      this.selectDataGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    408408            | System.Windows.Forms.AnchorStyles.Right)));
    409409      this.selectDataGroupBox.Controls.Add(this.splitContainer1);
     
    418418      // tabControl
    419419      //
    420       this.tabControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
    421             | System.Windows.Forms.AnchorStyles.Left) 
     420      this.tabControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     421            | System.Windows.Forms.AnchorStyles.Left)
    422422            | System.Windows.Forms.AnchorStyles.Right)));
    423423      this.tabControl.Controls.Add(this.tabPage1);
     
    453453      // dataTableView
    454454      //
    455       this.dataTableView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
    456             | System.Windows.Forms.AnchorStyles.Left) 
     455      this.dataTableView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     456            | System.Windows.Forms.AnchorStyles.Left)
    457457            | System.Windows.Forms.AnchorStyles.Right)));
    458458      this.dataTableView.Caption = "DataTable View";
     
    523523    private System.Windows.Forms.TabPage tabPage1;
    524524    private System.Windows.Forms.TabPage tabPage2;
    525     private Views.DataTableView dataTableView;
     525    private DensityDataTableView dataTableView;
    526526  }
    527527}
Note: See TracChangeset for help on using the changeset viewer.