Changeset 16140 for branches/2817-BinPackingSpeedup/HeuristicLab.DataPreprocessing.Views/3.4/DataPreprocessingView.cs
- Timestamp:
- 09/14/18 11:36:59 (6 years ago)
- Location:
- branches/2817-BinPackingSpeedup
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2817-BinPackingSpeedup
- Property svn:mergeinfo changed
-
branches/2817-BinPackingSpeedup/HeuristicLab.DataPreprocessing.Views
- Property svn:mergeinfo changed
-
branches/2817-BinPackingSpeedup/HeuristicLab.DataPreprocessing.Views/3.4/DataPreprocessingView.cs
r15185 r16140 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 49 49 if (Content != null) { 50 50 var data = Content.Data; 51 var filterLogic = new FilterLogic(data);52 var searchLogic = new SearchLogic(data, filterLogic);53 var statisticsLogic = new StatisticsLogic(data, searchLogic);54 var manipulationLogic = new ManipulationLogic(data, searchLogic, statisticsLogic);55 51 56 52 var viewShortcuts = new ItemList<IViewShortcut> { 57 new DataGridContent(data , manipulationLogic, filterLogic),58 new StatisticsContent(data , statisticsLogic),53 new DataGridContent(data), 54 new StatisticsContent(data), 59 55 60 56 new LineChartContent(data), … … 63 59 new MultiScatterPlotContent(data), 64 60 new CorrelationMatrixContent(Content), 65 new DataCompletenessChartContent( searchLogic),66 67 new FilterContent( filterLogic),68 new ManipulationContent( manipulationLogic, searchLogic, filterLogic),69 new TransformationContent(data , filterLogic)61 new DataCompletenessChartContent(data), 62 63 new FilterContent(data), 64 new ManipulationContent(data), 65 new TransformationContent(data) 70 66 }; 71 67 … … 150 146 importProblemDataTypeContextMenuStrip.Show(Cursor.Position); 151 147 } 152 private void importRegressionToolStripMenuItem_Click(object sender, EventArgs e) {153 Import(new RegressionCSVInstanceProvider(), new RegressionImportDialog(),154 (dialog => ((RegressionImportDialog)dialog).ImportType));155 } 156 private void importClassificationToolStripMenuItem_Click(object sender, EventArgs e) {157 Import(new ClassificationCSVInstanceProvider(), new ClassificationImportDialog(),158 (dialog => ((ClassificationImportDialog)dialog).ImportType));159 } 160 private void importTimeSeriesToolStripMenuItem_Click(object sender, EventArgs e) {161 Import(new TimeSeriesPrognosisCSVInstanceProvider(), new TimeSeriesPrognosisImportDialog(),162 (dialog => ((TimeSeriesPrognosisImportDialog)dialog).ImportType));163 } 164 private void Import<TProblemData, TImportType>(DataAnalysisInstanceProvider<TProblemData, TImportType> instanceProvider, DataAnalysisImportDialog importDialog,148 private async void importRegressionToolStripMenuItem_Click(object sender, EventArgs e) { 149 await ImportAsync(new RegressionCSVInstanceProvider(), new RegressionImportDialog(), 150 dialog => ((RegressionImportDialog)dialog).ImportType); 151 } 152 private async void importClassificationToolStripMenuItem_Click(object sender, EventArgs e) { 153 await ImportAsync(new ClassificationCSVInstanceProvider(), new ClassificationImportDialog(), 154 dialog => ((ClassificationImportDialog)dialog).ImportType); 155 } 156 private async void importTimeSeriesToolStripMenuItem_Click(object sender, EventArgs e) { 157 await ImportAsync(new TimeSeriesPrognosisCSVInstanceProvider(), new TimeSeriesPrognosisImportDialog(), 158 dialog => ((TimeSeriesPrognosisImportDialog)dialog).ImportType); 159 } 160 private async Task ImportAsync<TProblemData, TImportType>(DataAnalysisInstanceProvider<TProblemData, TImportType> instanceProvider, DataAnalysisImportDialog importDialog, 165 161 Func<DataAnalysisImportDialog, TImportType> getImportType) 166 162 where TProblemData : class, IDataAnalysisProblemData 167 163 where TImportType : DataAnalysisImportType { 168 164 if (importDialog.ShowDialog() == DialogResult.OK) { 169 Task.Run(() => {165 await Task.Run(() => { 170 166 TProblemData instance; 171 167 var mainForm = (MainForm.WindowsForms.MainForm)MainFormManager.MainForm;
Note: See TracChangeset
for help on using the changeset viewer.