Changeset 9936


Ignore:
Timestamp:
09/04/13 17:14:11 (6 years ago)
Author:
ascheibe
Message:

#2031 try to filter NaN values in correlation view and some other minor improvements

Location:
branches/StatisticalTesting/HeuristicLab.Analysis.Statistics/3.3
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/StatisticalTesting/HeuristicLab.Analysis.Statistics/3.3/CorrelationView.cs

    r9912 r9936  
    202202        }
    203203
    204         if (resultVals.Contains(double.NaN)
    205           || resultRowVals.Contains(double.NaN)
    206           || resultVals.Contains(double.NegativeInfinity)
    207           || resultVals.Contains(double.PositiveInfinity)
    208           || resultRowVals.Contains(double.NegativeInfinity)
    209           || resultRowVals.Contains(double.PositiveInfinity)
    210           || resultRowVals.Count != resultVals.Count) {
     204        resultVals = resultVals.Where(x => !double.IsNaN(x) && !double.IsNegativeInfinity(x) && !double.IsPositiveInfinity(x)).ToList();
     205        resultRowVals = resultRowVals.Where(x => !double.IsNaN(x) && !double.IsNegativeInfinity(x) && !double.IsPositiveInfinity(x)).ToList();
     206
     207        if (resultRowVals.Count == 0 || resultVals.Count == 0 || resultRowVals.Count != resultVals.Count) {
    211208          dt[j, 0] = double.NaN;
    212209          dt[j++, 1] = double.NaN;
  • branches/StatisticalTesting/HeuristicLab.Analysis.Statistics/3.3/StatisticalTestingView.cs

    r9923 r9936  
    288288      }
    289289
    290       for (int i = 0; i < res.Count(); i++) {
    291         if (res[i] < 0.1) {
    292           this.Invoke(new Action(() => { normalityLabel.Image = HeuristicLab.Common.Resources.VSImageLibrary.Warning; }));
    293         } else {
    294           this.Invoke(new Action(() => { normalityLabel.Image = HeuristicLab.Analysis.Statistics.Resources.Default; }));
    295         }
     290      // p-value is below significance level and thus the null hypothesis (data is normally distributed) is rejected.
     291      if (res.Any(x => x < 0.05)) {
     292        this.Invoke(new Action(() => { normalityLabel.Image = HeuristicLab.Common.Resources.VSImageLibrary.Warning; }));
     293      } else {
     294        this.Invoke(new Action(() => { normalityLabel.Image = HeuristicLab.Analysis.Statistics.Resources.Default; }));
    296295      }
    297296    }
  • branches/StatisticalTesting/HeuristicLab.Analysis.Statistics/3.3/StatisticalTestingView.designer.cs

    r9922 r9936  
    8888      // stringConvertibleMatrixView
    8989      //
    90       this.stringConvertibleMatrixView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    91             | System.Windows.Forms.AnchorStyles.Left)
     90      this.stringConvertibleMatrixView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
     91            | System.Windows.Forms.AnchorStyles.Left) 
    9292            | System.Windows.Forms.AnchorStyles.Right)));
    9393      this.stringConvertibleMatrixView.Caption = "StringConvertibleMatrix View";
     
    138138      // resultComboBox
    139139      //
    140       this.resultComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     140      this.resultComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
    141141            | System.Windows.Forms.AnchorStyles.Right)));
    142142      this.resultComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
     
    162162      // pValTextBox
    163163      //
    164       this.pValTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     164      this.pValTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
    165165            | System.Windows.Forms.AnchorStyles.Right)));
    166166      this.pValTextBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
     
    173173      // groupComboBox
    174174      //
    175       this.groupComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     175      this.groupComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
    176176            | System.Windows.Forms.AnchorStyles.Right)));
    177177      this.groupComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
     
    186186      // splitContainer1
    187187      //
    188       this.splitContainer1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    189             | System.Windows.Forms.AnchorStyles.Left)
     188      this.splitContainer1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
     189            | System.Windows.Forms.AnchorStyles.Left) 
    190190            | System.Windows.Forms.AnchorStyles.Right)));
    191191      this.splitContainer1.Location = new System.Drawing.Point(6, 19);
     
    208208      // splitContainer3
    209209      //
    210       this.splitContainer3.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    211             | System.Windows.Forms.AnchorStyles.Left)
     210      this.splitContainer3.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
     211            | System.Windows.Forms.AnchorStyles.Left) 
    212212            | System.Windows.Forms.AnchorStyles.Right)));
    213213      this.splitContainer3.Location = new System.Drawing.Point(8, 3);
     
    230230      // pairwiseTestGroupBox
    231231      //
    232       this.pairwiseTestGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    233             | System.Windows.Forms.AnchorStyles.Left)
     232      this.pairwiseTestGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
     233            | System.Windows.Forms.AnchorStyles.Left) 
    234234            | System.Windows.Forms.AnchorStyles.Right)));
    235235      this.pairwiseTestGroupBox.Controls.Add(this.pairwiseStringConvertibleMatrixView);
     
    240240      this.pairwiseTestGroupBox.Controls.Add(this.groupCompComboBox);
    241241      this.pairwiseTestGroupBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
    242       this.pairwiseTestGroupBox.Location = new System.Drawing.Point(3, 308);
     242      this.pairwiseTestGroupBox.Location = new System.Drawing.Point(3, 289);
    243243      this.pairwiseTestGroupBox.Name = "pairwiseTestGroupBox";
    244244      this.pairwiseTestGroupBox.Size = new System.Drawing.Size(388, 229);
     
    249249      // pairwiseStringConvertibleMatrixView
    250250      //
    251       this.pairwiseStringConvertibleMatrixView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    252             | System.Windows.Forms.AnchorStyles.Left)
     251      this.pairwiseStringConvertibleMatrixView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
     252            | System.Windows.Forms.AnchorStyles.Left) 
    253253            | System.Windows.Forms.AnchorStyles.Right)));
    254254      this.pairwiseStringConvertibleMatrixView.Caption = "StringConvertibleMatrix View";
     
    287287      // equalDistsTextBox
    288288      //
    289       this.equalDistsTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     289      this.equalDistsTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
    290290            | System.Windows.Forms.AnchorStyles.Right)));
    291291      this.equalDistsTextBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
     
    308308      // groupCompComboBox
    309309      //
    310       this.groupCompComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     310      this.groupCompComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
    311311            | System.Windows.Forms.AnchorStyles.Right)));
    312312      this.groupCompComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
     
    321321      // allGroupTestGroupBox
    322322      //
    323       this.allGroupTestGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     323      this.allGroupTestGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
    324324            | System.Windows.Forms.AnchorStyles.Right)));
    325325      this.allGroupTestGroupBox.Controls.Add(this.groupCompLabel);
     
    327327      this.allGroupTestGroupBox.Controls.Add(this.pValTextBox);
    328328      this.allGroupTestGroupBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
    329       this.allGroupTestGroupBox.Location = new System.Drawing.Point(3, 256);
     329      this.allGroupTestGroupBox.Location = new System.Drawing.Point(3, 237);
    330330      this.allGroupTestGroupBox.Name = "allGroupTestGroupBox";
    331331      this.allGroupTestGroupBox.Size = new System.Drawing.Size(388, 46);
     
    347347      // normalityGroupBox
    348348      //
    349       this.normalityGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     349      this.normalityGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
    350350            | System.Windows.Forms.AnchorStyles.Right)));
    351351      this.normalityGroupBox.Controls.Add(this.label4);
     
    353353      this.normalityGroupBox.Controls.Add(this.normalityLabel);
    354354      this.normalityGroupBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
    355       this.normalityGroupBox.Location = new System.Drawing.Point(3, 107);
     355      this.normalityGroupBox.Location = new System.Drawing.Point(3, 88);
    356356      this.normalityGroupBox.Name = "normalityGroupBox";
    357357      this.normalityGroupBox.Size = new System.Drawing.Size(388, 143);
     
    372372      // normalityStringConvertibleMatrixView
    373373      //
    374       this.normalityStringConvertibleMatrixView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    375             | System.Windows.Forms.AnchorStyles.Left)
     374      this.normalityStringConvertibleMatrixView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
     375            | System.Windows.Forms.AnchorStyles.Left) 
    376376            | System.Windows.Forms.AnchorStyles.Right)));
    377377      this.normalityStringConvertibleMatrixView.Caption = "StringConvertibleMatrix View";
     
    398398      // selectDataGroupBox
    399399      //
    400       this.selectDataGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     400      this.selectDataGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
    401401            | System.Windows.Forms.AnchorStyles.Right)));
    402402      this.selectDataGroupBox.Controls.Add(this.splitContainer1);
    403403      this.selectDataGroupBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
    404       this.selectDataGroupBox.Location = new System.Drawing.Point(3, 22);
     404      this.selectDataGroupBox.Location = new System.Drawing.Point(3, 3);
    405405      this.selectDataGroupBox.Name = "selectDataGroupBox";
    406406      this.selectDataGroupBox.Size = new System.Drawing.Size(388, 79);
     
    414414      this.Name = "StatisticalTestingView";
    415415      this.Size = new System.Drawing.Size(1089, 546);
    416       this.Controls.SetChildIndex(this.splitContainer3, 0);
    417416      this.contextMenuStrip1.ResumeLayout(false);
    418417      this.splitContainer1.Panel1.ResumeLayout(false);
  • branches/StatisticalTesting/HeuristicLab.Analysis.Statistics/3.3/StatisticalTestingView.resx

    r9917 r9936  
    118118    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
    119119  </resheader>
    120   <metadata name="helpToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    121     <value>17, 17</value>
    122   </metadata>
    123120  <metadata name="contextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    124121    <value>133, 17</value>
Note: See TracChangeset for help on using the changeset viewer.