Changeset 16692 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.Instances.DataAnalysis.Views
- Timestamp:
- 03/18/19 17:24:30 (5 years ago)
- Location:
- branches/2521_ProblemRefactoring
- Files:
-
- 8 deleted
- 15 edited
- 8 copied
Legend:
- Unmodified
- Added
- Removed
-
branches/2521_ProblemRefactoring
- Property svn:ignore
-
old new 24 24 protoc.exe 25 25 obj 26 .vs
-
- Property svn:mergeinfo changed
- Property svn:ignore
-
branches/2521_ProblemRefactoring/HeuristicLab.Problems.Instances.DataAnalysis.Views
- Property svn:mergeinfo changed
-
branches/2521_ProblemRefactoring/HeuristicLab.Problems.Instances.DataAnalysis.Views/3.3/ClassificationInstanceProviderView.Designer.cs
r12012 r16692 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic 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. -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.Instances.DataAnalysis.Views/3.3/ClassificationInstanceProviderView.cs
r12012 r16692 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic 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. … … 41 41 42 42 protected override void importButton_Click(object sender, EventArgs e) { 43 var importTypeDialog = new ClassificationImport TypeDialog();43 var importTypeDialog = new ClassificationImportDialog(); 44 44 if (importTypeDialog.ShowDialog() == DialogResult.OK) { 45 45 IClassificationProblemData instance = null; -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.Instances.DataAnalysis.Views/3.3/ClusteringInstanceProviderView.Designer.cs
r12012 r16692 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic 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. -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.Instances.DataAnalysis.Views/3.3/ClusteringInstanceProviderView.cs
r12012 r16692 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic 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. … … 41 41 42 42 protected override void importButton_Click(object sender, EventArgs e) { 43 var importTypeDialog = new DataAnalysisImport TypeDialog();43 var importTypeDialog = new DataAnalysisImportDialog(); 44 44 if (importTypeDialog.ShowDialog() == DialogResult.OK) { 45 45 IClusteringProblemData instance = null; -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.Instances.DataAnalysis.Views/3.3/DataAnalysisInstanceProviderView.Designer.cs
r12012 r16692 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic 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. -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.Instances.DataAnalysis.Views/3.3/DataAnalysisInstanceProviderView.cs
r12012 r16692 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic 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. … … 39 39 var provider = Content as DataAnalysisInstanceProvider<T, DataAnalysisImportType>; 40 40 if (provider != null) { 41 var importTypeDialog = new DataAnalysisImport TypeDialog();41 var importTypeDialog = new DataAnalysisImportDialog(); 42 42 if (importTypeDialog.ShowDialog() == DialogResult.OK) { 43 43 T instance = default(T); -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.Instances.DataAnalysis.Views/3.3/HeuristicLab.Problems.Instances.DataAnalysis.Views-3.3.csproj
r11623 r16692 93 93 </ItemGroup> 94 94 <ItemGroup> 95 <Compile Include="ClassificationImport TypeDialog.cs">96 <SubType>Form</SubType> 97 </Compile> 98 <Compile Include="ClassificationImport TypeDialog.Designer.cs">99 <DependentUpon>ClassificationImport TypeDialog.cs</DependentUpon>95 <Compile Include="ClassificationImportDialog.cs"> 96 <SubType>Form</SubType> 97 </Compile> 98 <Compile Include="ClassificationImportDialog.Designer.cs"> 99 <DependentUpon>ClassificationImportDialog.cs</DependentUpon> 100 100 </Compile> 101 101 <Compile Include="ClassificationInstanceProviderView.cs"> … … 111 111 <DependentUpon>ClusteringInstanceProviderView.cs</DependentUpon> 112 112 </Compile> 113 <Compile Include="TimeSeriesPrognosisImportTypeDialog.cs"> 114 <SubType>Form</SubType> 115 </Compile> 116 <Compile Include="TimeSeriesPrognosisImportTypeDialog.Designer.cs"> 117 <DependentUpon>TimeSeriesPrognosisImportTypeDialog.cs</DependentUpon> 113 <Compile Include="DataAnalysisImportDialog.cs"> 114 <SubType>Form</SubType> 115 </Compile> 116 <Compile Include="DataAnalysisImportDialog.Designer.cs"> 117 <DependentUpon>DataAnalysisImportDialog.cs</DependentUpon> 118 </Compile> 119 <Compile Include="RegressionImportDialog.cs"> 120 <SubType>Form</SubType> 121 </Compile> 122 <Compile Include="RegressionImportDialog.Designer.cs"> 123 <DependentUpon>RegressionImportDialog.cs</DependentUpon> 124 </Compile> 125 <Compile Include="TimeSeriesPrognosisImportDialog.cs"> 126 <SubType>Form</SubType> 127 </Compile> 128 <Compile Include="TimeSeriesPrognosisImportDialog.Designer.cs"> 129 <DependentUpon>TimeSeriesPrognosisImportDialog.cs</DependentUpon> 118 130 </Compile> 119 131 <Compile Include="TimeSeriesPrognosisInstanceProviderView.cs"> … … 123 135 <DependentUpon>TimeSeriesPrognosisInstanceProviderView.cs</DependentUpon> 124 136 </Compile> 125 <Compile Include="DataAnalysisImportTypeDialog.cs">126 <SubType>Form</SubType>127 </Compile>128 <Compile Include="DataAnalysisImportTypeDialog.Designer.cs">129 <DependentUpon>DataAnalysisImportTypeDialog.cs</DependentUpon>130 </Compile>131 137 <Compile Include="DataAnalysisInstanceProviderView.cs"> 132 138 <SubType>UserControl</SubType> … … 136 142 </Compile> 137 143 <Compile Include="Plugin.cs" /> 138 <Compile Include="RegressionImportTypeDialog.cs">139 <SubType>Form</SubType>140 </Compile>141 <Compile Include="RegressionImportTypeDialog.Designer.cs">142 <DependentUpon>RegressionImportTypeDialog.cs</DependentUpon>143 </Compile>144 144 <Compile Include="RegressionInstanceProviderView.cs"> 145 145 <SubType>UserControl</SubType> -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.Instances.DataAnalysis.Views/3.3/Plugin.cs.frame
r13321 r16692 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic 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. … … 23 23 24 24 namespace HeuristicLab.Problems.Instances.DataAnalysis.Views { 25 [Plugin("HeuristicLab.Problems.Instances.DataAnalysis.Views", "3.3.1 3.$WCREV$")]25 [Plugin("HeuristicLab.Problems.Instances.DataAnalysis.Views", "3.3.15.$WCREV$")] 26 26 [PluginFile("HeuristicLab.Problems.Instances.DataAnalysis.Views-3.3.dll", PluginFileType.Assembly)] 27 [PluginDependency("HeuristicLab.Common", "3.3")] 27 28 [PluginDependency("HeuristicLab.Common.Resources", "3.3")] 28 29 [PluginDependency("HeuristicLab.Core.Views", "3.3")] -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.Instances.DataAnalysis.Views/3.3/Properties/AssemblyInfo.cs.frame
r13321 r16692 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic 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. … … 32 32 [assembly: AssemblyCompany("HEAL")] 33 33 [assembly: AssemblyProduct("HeuristicLab")] 34 [assembly: AssemblyCopyright("(c) 2002-201 5HEAL")]34 [assembly: AssemblyCopyright("(c) 2002-2018 HEAL")] 35 35 [assembly: AssemblyTrademark("")] 36 36 [assembly: AssemblyCulture("")] … … 55 55 // [assembly: AssemblyVersion("1.0.*")] 56 56 [assembly: AssemblyVersion("3.3.0.0")] 57 [assembly: AssemblyFileVersion("3.3.1 3.$WCREV$")]57 [assembly: AssemblyFileVersion("3.3.15.$WCREV$")] -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.Instances.DataAnalysis.Views/3.3/RegressionInstanceProviderView.Designer.cs
r12012 r16692 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic 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. -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.Instances.DataAnalysis.Views/3.3/RegressionInstanceProviderView.cs
r12012 r16692 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic 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. … … 21 21 22 22 using System; 23 using System. IO;23 using System.Threading.Tasks; 24 24 using System.Windows.Forms; 25 25 using HeuristicLab.MainForm; … … 41 41 42 42 protected override void importButton_Click(object sender, EventArgs e) { 43 var importTypeDialog = new RegressionImport TypeDialog();43 var importTypeDialog = new RegressionImportDialog(); 44 44 if (importTypeDialog.ShowDialog() == DialogResult.OK) { 45 45 IRegressionProblemData instance = null; 46 try { 47 instance = Content.ImportData(importTypeDialog.Path, importTypeDialog.ImportType, importTypeDialog.CSVFormat); 48 } catch (IOException ex) { 49 ErrorWhileParsing(ex); 50 return; 51 } 52 try { 53 GenericConsumer.Load(instance); 54 instancesComboBox.SelectedIndex = -1; 55 } catch (IOException ex) { 56 ErrorWhileLoading(ex, importTypeDialog.Path); 57 } 46 47 Task.Factory.StartNew(() => { 48 var mainForm = (MainForm.WindowsForms.MainForm)MainFormManager.MainForm; 49 // lock active view and show progress bar 50 IContentView activeView = (IContentView)MainFormManager.MainForm.ActiveView; 51 52 try { 53 var progress = mainForm.AddOperationProgressToContent(activeView.Content, 54 "Loading problem instance."); 55 56 Content.ProgressChanged += 57 (o, args) => { progress.ProgressValue = args.ProgressPercentage / 100.0; }; 58 59 instance = Content.ImportData(importTypeDialog.Path, importTypeDialog.ImportType, 60 importTypeDialog.CSVFormat); 61 } catch (Exception ex) { 62 ErrorWhileParsing(ex); 63 return; 64 } finally { 65 mainForm.RemoveOperationProgressFromContent(activeView.Content); 66 } 67 68 try { 69 GenericConsumer.Load(instance); 70 } catch (Exception ex) { 71 ErrorWhileLoading(ex, importTypeDialog.Path); 72 } finally { 73 Invoke((Action)(() => instancesComboBox.SelectedIndex = -1)); 74 } 75 }); 58 76 } 59 77 } -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.Instances.DataAnalysis.Views/3.3/TimeSeriesPrognosisInstanceProviderView.Designer.cs
r12012 r16692 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic 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. -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.Instances.DataAnalysis.Views/3.3/TimeSeriesPrognosisInstanceProviderView.cs
r12012 r16692 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 5Heuristic 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. … … 41 41 42 42 protected override void importButton_Click(object sender, EventArgs e) { 43 var importTypeDialog = new TimeSeriesPrognosisImport TypeDialog();43 var importTypeDialog = new TimeSeriesPrognosisImportDialog(); 44 44 if (importTypeDialog.ShowDialog() == DialogResult.OK) { 45 45 ITimeSeriesPrognosisProblemData instance = null;
Note: See TracChangeset
for help on using the changeset viewer.