Changeset 11612


Ignore:
Timestamp:
12/01/14 22:47:19 (8 years ago)
Author:
ascheibe
Message:

#2031 fixed a bug in the progress handling of the statistical testing view

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

Legend:

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

    r11611 r11612  
    3737  public sealed partial class StatisticalTestingView : ItemView {
    3838    private const double significanceLevel = 0.05;
     39    private const int requiredSampleSize = 5;
    3940    private double[][] data;
    4041
     
    212213    private void GenerateChart(DataTable histogramTable) {
    213214      foreach (var row in histogramTable.Rows) {
    214         dataTableView.AddPoints(row.Name, row.Values, true);
     215        histogramControl.AddPoints(row.Name, row.Values, true);
    215216      }
    216217    }
     
    254255
    255256      //alglib needs at least 5 samples for computation
    256       if (data.Any(x => x.Length <= 5)) {
     257      if (data.Any(x => x.Length <= requiredSampleSize)) {
    257258        if (showMessage)
    258259          MessageBox.Show(this, "You need to choose samples with a size greater 5.", "HeuristicLab", MessageBoxButtons.OK,
     
    290291        return;
    291292
    292       MainFormManager.GetMainForm<HeuristicLab.MainForm.WindowsForms.MainForm>().AddOperationProgressToView(this, "Calculating...");
     293      MainFormManager.GetMainForm<HeuristicLab.MainForm.WindowsForms.MainForm>().AddOperationProgressToView(pairwiseTestGroupBox, "Calculating...");
    293294      Task.Factory.StartNew(() => CalculatePairwiseAsync(groupName));
    294295    }
     
    298299      CalculatePairwiseTestDetails(groupName);
    299300
    300       MainFormManager.GetMainForm<HeuristicLab.MainForm.WindowsForms.MainForm>().RemoveOperationProgressFromView(this);
     301      MainFormManager.GetMainForm<HeuristicLab.MainForm.WindowsForms.MainForm>().RemoveOperationProgressFromView(pairwiseTestGroupBox);
    301302    }
    302303
  • branches/StatisticalTesting/HeuristicLab.Analysis.Statistics/3.3/StatisticalTestingView.designer.cs

    r11611 r11612  
    7474      this.tabPage1 = new System.Windows.Forms.TabPage();
    7575      this.tabPage2 = new System.Windows.Forms.TabPage();
    76       this.dataTableView = new HeuristicLab.Analysis.Views.HistogramControl();
     76      this.histogramControl = new HeuristicLab.Analysis.Views.HistogramControl();
    7777      this.contextMenuStrip1.SuspendLayout();
    7878      ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
     
    442442      // tabPage2
    443443      //
    444       this.tabPage2.Controls.Add(this.dataTableView);
     444      this.tabPage2.Controls.Add(this.histogramControl);
    445445      this.tabPage2.Location = new System.Drawing.Point(4, 22);
    446446      this.tabPage2.Name = "tabPage2";
     
    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)
    457             | System.Windows.Forms.AnchorStyles.Right)));
    458       this.dataTableView.Location = new System.Drawing.Point(6, 6);
    459       this.dataTableView.Name = "dataTableView";
    460       this.dataTableView.Size = new System.Drawing.Size(910, 529);
    461       this.dataTableView.TabIndex = 0;
     455      this.histogramControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     456            | System.Windows.Forms.AnchorStyles.Left)
     457            | System.Windows.Forms.AnchorStyles.Right)));
     458      this.histogramControl.Location = new System.Drawing.Point(6, 6);
     459      this.histogramControl.Name = "dataTableView";
     460      this.histogramControl.Size = new System.Drawing.Size(910, 529);
     461      this.histogramControl.TabIndex = 0;
    462462      //
    463463      // StatisticalTestingView
     
    520520    private System.Windows.Forms.TabPage tabPage1;
    521521    private System.Windows.Forms.TabPage tabPage2;
    522     private HeuristicLab.Analysis.Views.HistogramControl dataTableView;
     522    private HeuristicLab.Analysis.Views.HistogramControl histogramControl;
    523523  }
    524524}
Note: See TracChangeset for help on using the changeset viewer.