Changeset 8529 for branches/DatasetFeatureCorrelation/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/FeatureCorrelation.cs
- Timestamp:
- 08/27/12 17:59:55 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/DatasetFeatureCorrelation/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/FeatureCorrelation.cs
r8492 r8529 65 65 66 66 private BackgroundWorker bw; 67 private BackgroundWorkerInfo bwInfo; 67 68 68 69 public FeatureCorrelation() … … 80 81 this.rowNames = problemData.Dataset.DoubleVariables.ToList(); 81 82 sortableView = true; 82 83 CalculateElements(problemData.Dataset);84 83 } 85 84 protected FeatureCorrelation(FeatureCorrelation original, Cloner cloner) … … 107 106 108 107 private void CalculateElements(Dataset dataset, string calc, string partition, string variable = null, int frames = 0) { 109 if (bw == null || bw.IsBusy) { 110 if (bw != null) { 111 bw.CancelAsync(); 112 } 108 bwInfo = new BackgroundWorkerInfo { Dataset = dataset, Calculator = calc, Partition = partition, Variable = variable, Frames = frames }; 109 if (bw == null) { 113 110 bw = new BackgroundWorker(); 114 111 bw.WorkerReportsProgress = true; … … 118 115 bw.RunWorkerCompleted += new RunWorkerCompletedEventHandler(BwRunWorkerCompleted); 119 116 } 120 bw.RunWorkerAsync(new BackgroundWorkerInfo { Dataset = dataset, Calculator = calc, Partition = partition, Variable = variable, Frames = frames }); 117 if (bw.IsBusy) { 118 bw.CancelAsync(); 119 } else { 120 bw.RunWorkerAsync(bwInfo); 121 } 121 122 if (calc.Equals(PearsonsR) || calc.Equals(SpearmansRank)) { 122 123 Maximum = 1.0; … … 256 257 OnCorrelationCalculationFinished(); 257 258 } 259 } else { 260 bw.RunWorkerAsync(bwInfo); 258 261 } 259 262 }
Note: See TracChangeset
for help on using the changeset viewer.