Changeset 9383


Ignore:
Timestamp:
04/19/13 13:01:53 (7 years ago)
Author:
ascheibe
Message:

#2031 ResultCorrelationView is now sortable and some minor cosmetic improvements

Location:
branches/StatisticalTesting/HeuristicLab.Analysis.Statistics/3.3
Files:
1 edited
2 moved

Legend:

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

    r9382 r9383  
    3030
    3131namespace HeuristicLab.Analysis.Statistics {
    32   [View("Result Correlation View")]
     32  [View("Correlation View")]
    3333  [Content(typeof(RunCollection), false)]
    34   public sealed partial class ResultCorrelationView : ItemView {
    35     public ResultCorrelationView() {
     34  public sealed partial class CorrelationView : ItemView {
     35    private enum ResultParameterType {
     36      Result,
     37      Parameter
     38    }
     39
     40    public new RunCollection Content {
     41      get { return (RunCollection)base.Content; }
     42      set { base.Content = value; }
     43    }
     44
     45    public override bool ReadOnly {
     46      get { return true; }
     47      set { /*not needed because results are always readonly */}
     48    }
     49
     50    private Dictionary<string, ResultParameterType> resultsParameters;
     51
     52    public CorrelationView() {
    3653      InitializeComponent();
    3754      stringConvertibleMatrixView.Minimum = -1.0;
    3855      stringConvertibleMatrixView.Maximum = 1.0;
    3956    }
    40 
    41     public new RunCollection Content {
    42       get { return (RunCollection)base.Content; }
    43       set { base.Content = value; }
    44     }
    45 
    46     public override bool ReadOnly {
    47       get { return true; }
    48       set { /*not needed because results are always readonly */}
    49     }
    50 
    51     private Dictionary<string, ResultParameterType> resultsParameters;
    5257
    5358    protected override void OnContentChanged() {
     
    95100      }
    96101    }
     102
     103    private void calculateCorrelation_Click(object sender, EventArgs e) {
     104      RebuildCorrelationTable();
     105    }
    97106    #endregion
    98107
     
    174183      columnNames[0] = "Pearson product-moment correlation coefficient";
    175184      columnNames[1] = "Spearman's rank correlation coefficient";
    176 
    177185
    178186      var runs = Content.Where(x => x.Results.ContainsKey(resultName) && x.Visible);
     
    207215      }
    208216
     217      dt.SortableView = true;
    209218      stringConvertibleMatrixView.Content = dt;
    210     }
    211 
    212     private void calculateCorrelation_Click(object sender, EventArgs e) {
    213       RebuildCorrelationTable();
    214     }
    215 
    216     private enum ResultParameterType {
    217       Result,
    218       Parameter
    219219    }
    220220  }
  • branches/StatisticalTesting/HeuristicLab.Analysis.Statistics/3.3/CorrelationView.designer.cs

    r9382 r9383  
    2121
    2222namespace HeuristicLab.Analysis.Statistics {
    23   partial class ResultCorrelationView {
     23  partial class CorrelationView {
    2424    /// <summary>
    2525    /// Required designer variable.
     
    7373      this.label1.Size = new System.Drawing.Size(40, 13);
    7474      this.label1.TabIndex = 6;
    75       this.label1.Text = "Result:";
     75      this.label1.Text = "Value:";
    7676      //
    7777      // resultComboBox
     
    103103      this.Controls.Add(this.resultComboBox);
    104104      this.Controls.Add(this.stringConvertibleMatrixView);
    105       this.Name = "ResultCorrelationView";
     105      this.Name = "CorrelationView";
    106106      this.Size = new System.Drawing.Size(498, 385);
    107107      this.ResumeLayout(false);
  • branches/StatisticalTesting/HeuristicLab.Analysis.Statistics/3.3/HeuristicLab.Analysis.Statistics-3.3.csproj

    r9355 r9383  
    135135    </Compile>
    136136    <Compile Include="KruskalWallis.cs" />
    137     <Compile Include="ResultCorrelationView.cs">
     137    <Compile Include="CorrelationView.cs">
    138138      <SubType>UserControl</SubType>
    139139    </Compile>
    140     <Compile Include="ResultCorrelationView.designer.cs">
    141       <DependentUpon>ResultCorrelationView.cs</DependentUpon>
     140    <Compile Include="CorrelationView.designer.cs">
     141      <DependentUpon>CorrelationView.cs</DependentUpon>
    142142    </Compile>
    143143    <Compile Include="ChartAnalysisView.cs">
Note: See TracChangeset for help on using the changeset viewer.