Changeset 12694 for branches/HeuristicLab.Problems.Orienteering/HeuristicLab.DataPreprocessing.Views/3.4
- Timestamp:
- 07/09/15 13:07:30 (9 years ago)
- Location:
- branches/HeuristicLab.Problems.Orienteering
- Files:
-
- 37 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HeuristicLab.Problems.Orienteering
- Property svn:mergeinfo changed
-
Property
svn:global-ignores
set to
*.nuget
packages
-
branches/HeuristicLab.Problems.Orienteering/HeuristicLab.DataPreprocessing.Views
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/stable/HeuristicLab.DataPreprocessing.Views merged eligible /trunk/sources/HeuristicLab.DataPreprocessing.Views merged eligible /branches/1721-RandomForestPersistence/HeuristicLab.DataPreprocessing.Views 10321-10322 /branches/Algorithms.GradientDescent/HeuristicLab.DataPreprocessing.Views 5516-5520 /branches/Benchmarking/sources/HeuristicLab.DataPreprocessing.Views 6917-7005 /branches/CloningRefactoring/HeuristicLab.DataPreprocessing.Views 4656-4721 /branches/CodeEditor/HeuristicLab.DataPreprocessing.Views 11700-11806 /branches/DataAnalysis Refactoring/HeuristicLab.DataPreprocessing.Views 5471-5808 /branches/DataAnalysis SolutionEnsembles/HeuristicLab.DataPreprocessing.Views 5815-6180 /branches/DataAnalysis/HeuristicLab.DataPreprocessing.Views 4458-4459,4462,4464 /branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views 10085-11101 /branches/DataPreprocessingImprovements/HeuristicLab.DataPreprocessing.Views 12054-12675 /branches/GP.Grammar.Editor/HeuristicLab.DataPreprocessing.Views 6284-6795 /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.DataPreprocessing.Views 5060 /branches/HLScript/HeuristicLab.DataPreprocessing.Views 10331-10358 /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.DataPreprocessing.Views 11570-12508 /branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.DataPreprocessing.Views 6123-9799 /branches/LogResidualEvaluator/HeuristicLab.DataPreprocessing.Views 10202-10483 /branches/NET40/sources/HeuristicLab.DataPreprocessing.Views 5138-5162 /branches/NSGA-II Changes/HeuristicLab.DataPreprocessing.Views 12033-12122 /branches/ParallelEngine/HeuristicLab.DataPreprocessing.Views 5175-5192 /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.DataPreprocessing.Views 7568-7810 /branches/QAPAlgorithms/HeuristicLab.DataPreprocessing.Views 6350-6627 /branches/Restructure trunk solution/HeuristicLab.DataPreprocessing.Views 6828 /branches/RuntimeOptimizer/HeuristicLab.DataPreprocessing.Views 8943-9078 /branches/ScatterSearch (trunk integration)/HeuristicLab.DataPreprocessing.Views 7787-8333 /branches/SlaveShutdown/HeuristicLab.DataPreprocessing.Views 8944-8956 /branches/SpectralKernelForGaussianProcesses/HeuristicLab.DataPreprocessing.Views 10204-10479 /branches/SuccessProgressAnalysis/HeuristicLab.DataPreprocessing.Views 5370-5682 /branches/Trunk/HeuristicLab.DataPreprocessing.Views 6829-6865 /branches/UnloadJobs/HeuristicLab.DataPreprocessing.Views 9168-9215 /branches/VNS/HeuristicLab.DataPreprocessing.Views 5594-5752 /branches/histogram/HeuristicLab.DataPreprocessing.Views 5959-6341
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/HeuristicLab.Problems.Orienteering/HeuristicLab.DataPreprocessing.Views/3.4/CheckedTransformationListView.Designer.cs
r11185 r12694 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/HeuristicLab.Problems.Orienteering/HeuristicLab.DataPreprocessing.Views/3.4/CheckedTransformationListView.cs
r11185 r12694 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/HeuristicLab.Problems.Orienteering/HeuristicLab.DataPreprocessing.Views/3.4/ComparisonFilterView.Designer.cs
r11185 r12694 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/HeuristicLab.Problems.Orienteering/HeuristicLab.DataPreprocessing.Views/3.4/ComparisonFilterView.cs
r11185 r12694 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/HeuristicLab.Problems.Orienteering/HeuristicLab.DataPreprocessing.Views/3.4/DataGridContentView.Designer.cs
r11185 r12694 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/HeuristicLab.Problems.Orienteering/HeuristicLab.DataPreprocessing.Views/3.4/DataGridContentView.cs
r11185 r12694 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 61 61 dataGridView.KeyDown += dataGridView_KeyDown; 62 62 dataGridView.MouseUp += dataGridView_MouseUp; 63 dataGridView.ColumnHeaderMouseClick += dataGridView_ColumnHeaderMouseClick;64 63 contextMenuCell.Items.Add(ShowHideColumns); 65 64 _highlightedCellsBackground = new Dictionary<int, IList<int>>(); … … 127 126 128 127 string errorMessage; 129 if ( Content != null) {128 if (!String.IsNullOrEmpty(e.FormattedValue.ToString())) { 130 129 if (dataGridView.IsCurrentCellInEditMode && Content.FilterLogic.IsFiltered) { 131 130 errorMessage = "A filter is active, you cannot modify data. Press ESC to exit edit mode."; … … 164 163 } 165 164 166 private void dataGridView_ColumnHeaderMouseClick(object sender, DataGridViewCellMouseEventArgs e) { 165 protected override void dataGridView_ColumnHeaderMouseClick(object sender, DataGridViewCellMouseEventArgs e) { 166 if (Content != null) { 167 if (e.Button == System.Windows.Forms.MouseButtons.Left) { 168 dataGridView.Focus(); 169 dataGridView.ClearSelection(); 170 dataGridView.SelectionChanged -= dataGridView_SelectionChanged; 171 for (int i = 0; i < dataGridView.RowCount; i++) { 172 if (i + 1 == dataGridView.RowCount) 173 dataGridView.SelectionChanged += dataGridView_SelectionChanged; 174 dataGridView[e.ColumnIndex, i].Selected = true; 175 } 176 } else if (Content.SortableView) { 177 SortColumn(e.ColumnIndex); 178 } 179 } 167 180 searchIterator = null; 168 181 } … … 437 450 private void dataGridView_CellMouseClick(object sender, DataGridViewCellMouseEventArgs e) { 438 451 if (Content == null) return; 439 if (e.Button == System.Windows.Forms.MouseButtons.Right ) {452 if (e.Button == System.Windows.Forms.MouseButtons.Right && !(e.ColumnIndex != -1 && e.RowIndex == -1)) { 440 453 if (e.ColumnIndex == -1 || e.RowIndex == -1) { 441 454 replaceValueOverColumnToolStripMenuItem.Visible = false; … … 474 487 private void dataGridView_KeyDown(object sender, KeyEventArgs e) { 475 488 var selectedRows = dataGridView.SelectedRows; 476 if (e.KeyCode == Keys.Delete && selectedRows.Count > 0) { 477 List<int> rows = new List<int>(); 478 for (int i = 0; i < selectedRows.Count; ++i) { 479 rows.Add(selectedRows[i].Index); 480 } 481 Content.DeleteRow(rows); 482 } else if (e.Control && e.KeyCode == Keys.F) { 483 CreateFindAndReplaceDialog(); 484 findAndReplaceDialog.ActivateSearch(); 485 } else if (e.Control && e.KeyCode == Keys.R) { 486 CreateFindAndReplaceDialog(); 487 findAndReplaceDialog.ActivateReplace(); 489 var selectedCells = dataGridView.SelectedCells; 490 if (!Content.FilterLogic.IsFiltered) { //data is in read only mode.... 491 if (e.KeyCode == Keys.Delete && selectedCells.Count == Content.Rows && selectedCells.Count > 0) { 492 Content.DeleteColumn(selectedCells[0].ColumnIndex); 493 } else if (e.KeyCode == Keys.Delete && selectedRows.Count > 0) { 494 List<int> rows = new List<int>(); 495 for (int i = 0; i < selectedRows.Count; ++i) { 496 int index = (sortedColumnIndices.Count != 0) ? (Convert.ToInt32(selectedRows[i].HeaderCell.Value) - 1) : 497 selectedRows[i].Index; 498 rows.Add(index); 499 } 500 Content.DeleteRows(rows); 501 } else if (e.Control && e.KeyCode == Keys.F) { 502 CreateFindAndReplaceDialog(); 503 findAndReplaceDialog.ActivateSearch(); 504 } else if (e.Control && e.KeyCode == Keys.R) { 505 CreateFindAndReplaceDialog(); 506 findAndReplaceDialog.ActivateReplace(); 507 } 488 508 } 489 509 } -
branches/HeuristicLab.Problems.Orienteering/HeuristicLab.DataPreprocessing.Views/3.4/DataPreprocessingView.cs
r11185 r12694 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 46 46 if (Content != null) { 47 47 var data = Content.Data; 48 var searchLogic = new SearchLogic(data); 48 var filterLogic = new FilterLogic(data); 49 var searchLogic = new SearchLogic(data, filterLogic); 49 50 var statisticsLogic = new StatisticsLogic(data, searchLogic); 50 51 var manipulationLogic = new ManipulationLogic(data, searchLogic, statisticsLogic); 51 var filterLogic = new FilterLogic(data);52 52 53 53 var viewShortcuts = new ItemList<IViewShortcut> { -
branches/HeuristicLab.Problems.Orienteering/HeuristicLab.DataPreprocessing.Views/3.4/DataPreprocessingView.designer.cs
r11185 r12694 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/HeuristicLab.Problems.Orienteering/HeuristicLab.DataPreprocessing.Views/3.4/DataPreprocessorStarter.cs
r11303 r12694 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 44 44 IContentView contentView = control as IContentView; 45 45 if (contentView != null) { 46 algorithm = contentView.Content as IAlgorithm; 47 problem = contentView.Content as IDataAnalysisProblem; 46 var newAlgorithm = contentView.Content as IAlgorithm; 47 if (newAlgorithm != null) 48 algorithm = newAlgorithm; 49 var newProblem = contentView.Content as IDataAnalysisProblem; 50 if (newProblem != null) 51 problem = newProblem; 48 52 } 49 53 control = control.Parent; -
branches/HeuristicLab.Problems.Orienteering/HeuristicLab.DataPreprocessing.Views/3.4/HeuristicLab.DataPreprocessing.Views-3.4.csproj
r11116 r12694 10 10 <RootNamespace>HeuristicLab.DataPreprocessing.Views</RootNamespace> 11 11 <AssemblyName>HeuristicLab.DataPreprocessing.Views-3.4</AssemblyName> 12 <TargetFrameworkVersion>v4. 0</TargetFrameworkVersion>12 <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> 13 13 <FileAlignment>512</FileAlignment> 14 14 <TargetFrameworkProfile /> … … 18 18 <DebugType>full</DebugType> 19 19 <Optimize>false</Optimize> 20 <OutputPath> ..\..\bin\</OutputPath>20 <OutputPath>$(SolutionDir)\bin\</OutputPath> 21 21 <DefineConstants>DEBUG;TRACE</DefineConstants> 22 22 <ErrorReport>prompt</ErrorReport> 23 23 <WarningLevel>4</WarningLevel> 24 <UseVSHostingProcess>false</UseVSHostingProcess> 24 <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> 25 <Prefer32Bit>false</Prefer32Bit> 25 26 </PropertyGroup> 26 27 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> 27 28 <DebugType>pdbonly</DebugType> 28 29 <Optimize>true</Optimize> 29 <OutputPath> ..\..\bin\</OutputPath>30 <OutputPath>$(SolutionDir)\bin\</OutputPath> 30 31 <DefineConstants>TRACE</DefineConstants> 31 32 <ErrorReport>prompt</ErrorReport> 32 33 <WarningLevel>4</WarningLevel> 34 <DocumentationFile> 35 </DocumentationFile> 36 <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> 37 <Prefer32Bit>false</Prefer32Bit> 38 </PropertyGroup> 39 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' "> 40 <DebugSymbols>true</DebugSymbols> 41 <OutputPath>$(SolutionDir)\bin\</OutputPath> 42 <DefineConstants>DEBUG;TRACE</DefineConstants> 43 <DebugType>full</DebugType> 44 <PlatformTarget>x64</PlatformTarget> 45 <ErrorReport>prompt</ErrorReport> 46 <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> 47 <Prefer32Bit>false</Prefer32Bit> 48 </PropertyGroup> 49 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' "> 50 <OutputPath>$(SolutionDir)\bin\</OutputPath> 51 <DefineConstants>TRACE</DefineConstants> 52 <DocumentationFile> 53 </DocumentationFile> 54 <Optimize>true</Optimize> 55 <DebugType>pdbonly</DebugType> 56 <PlatformTarget>x64</PlatformTarget> 57 <ErrorReport>prompt</ErrorReport> 58 <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> 59 <Prefer32Bit>false</Prefer32Bit> 60 </PropertyGroup> 61 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> 62 <DebugSymbols>true</DebugSymbols> 63 <OutputPath>$(SolutionDir)\bin\</OutputPath> 64 <DefineConstants>DEBUG;TRACE</DefineConstants> 65 <DebugType>full</DebugType> 66 <PlatformTarget>x86</PlatformTarget> 67 <ErrorReport>prompt</ErrorReport> 68 <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> 69 <Prefer32Bit>false</Prefer32Bit> 70 </PropertyGroup> 71 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> 72 <OutputPath>$(SolutionDir)\bin\</OutputPath> 73 <DefineConstants>TRACE</DefineConstants> 74 <DocumentationFile> 75 </DocumentationFile> 76 <Optimize>true</Optimize> 77 <DebugType>pdbonly</DebugType> 78 <PlatformTarget>x86</PlatformTarget> 79 <ErrorReport>prompt</ErrorReport> 80 <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> 81 <Prefer32Bit>false</Prefer32Bit> 33 82 </PropertyGroup> 34 83 <PropertyGroup> … … 272 321 </ItemGroup> 273 322 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> 274 <PropertyGroup>323 <PropertyGroup> 275 324 <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir) 276 325 set ProjectDir=$(ProjectDir) -
branches/HeuristicLab.Problems.Orienteering/HeuristicLab.DataPreprocessing.Views/3.4/HistogramView.Designer.cs
r11043 r12694 25 25 private void InitializeComponent() { 26 26 this.optionsBox = new System.Windows.Forms.GroupBox(); 27 this.displayDetailsCheckBox = new System.Windows.Forms.CheckBox(); 27 28 this.label1 = new System.Windows.Forms.Label(); 28 29 this.classifierComboBox = new System.Windows.Forms.ComboBox(); … … 33 34 // 34 35 this.optionsBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); 36 this.optionsBox.Controls.Add(this.displayDetailsCheckBox); 35 37 this.optionsBox.Controls.Add(this.label1); 36 38 this.optionsBox.Controls.Add(this.classifierComboBox); 37 this.optionsBox.Location = new System.Drawing.Point(4, 263); 39 this.optionsBox.Location = new System.Drawing.Point(5, 324); 40 this.optionsBox.Margin = new System.Windows.Forms.Padding(4); 38 41 this.optionsBox.Name = "optionsBox"; 39 this.optionsBox.Size = new System.Drawing.Size(152, 134); 42 this.optionsBox.Padding = new System.Windows.Forms.Padding(4); 43 this.optionsBox.Size = new System.Drawing.Size(203, 165); 40 44 this.optionsBox.TabIndex = 7; 41 45 this.optionsBox.TabStop = false; 42 46 this.optionsBox.Text = "Options"; 43 47 // 48 // displayDetailsCheckBox 49 // 50 this.displayDetailsCheckBox.AutoSize = true; 51 this.displayDetailsCheckBox.Location = new System.Drawing.Point(7, 71); 52 this.displayDetailsCheckBox.Name = "displayDetailsCheckBox"; 53 this.displayDetailsCheckBox.RightToLeft = System.Windows.Forms.RightToLeft.Yes; 54 this.displayDetailsCheckBox.Size = new System.Drawing.Size(153, 21); 55 this.displayDetailsCheckBox.TabIndex = 3; 56 this.displayDetailsCheckBox.Text = "Display value count"; 57 this.displayDetailsCheckBox.UseVisualStyleBackColor = true; 58 this.displayDetailsCheckBox.CheckedChanged += new System.EventHandler(this.displayDetailsCheckBox_CheckedChanged); 59 // 44 60 // label1 45 61 // 46 62 this.label1.AutoSize = true; 47 this.label1.Location = new System.Drawing.Point(6, 26); 63 this.label1.Location = new System.Drawing.Point(4, 19); 64 this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); 48 65 this.label1.Name = "label1"; 49 this.label1.Size = new System.Drawing.Size( 91, 13);66 this.label1.Size = new System.Drawing.Size(108, 17); 50 67 this.label1.TabIndex = 2; 51 this.label1.Text = " Classifiervariable:";68 this.label1.Text = "Target variable:"; 52 69 // 53 70 // classifierComboBox … … 55 72 this.classifierComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; 56 73 this.classifierComboBox.FormattingEnabled = true; 57 this.classifierComboBox.Location = new System.Drawing.Point(9, 52); 74 this.classifierComboBox.Location = new System.Drawing.Point(7, 40); 75 this.classifierComboBox.Margin = new System.Windows.Forms.Padding(4); 58 76 this.classifierComboBox.Name = "classifierComboBox"; 59 this.classifierComboBox.Size = new System.Drawing.Size(1 21, 21);77 this.classifierComboBox.Size = new System.Drawing.Size(160, 24); 60 78 this.classifierComboBox.TabIndex = 1; 61 79 this.classifierComboBox.SelectedIndexChanged += new System.EventHandler(this.classifierComboBox_SelectedIndexChanged); … … 63 81 // HistogramView 64 82 // 65 this.AutoScaleDimensions = new System.Drawing.SizeF( 6F, 13F);83 this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); 66 84 this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; 67 85 this.Controls.Add(this.optionsBox); 86 this.Margin = new System.Windows.Forms.Padding(5); 68 87 this.Name = "HistogramView"; 69 88 this.Controls.SetChildIndex(this.optionsBox, 0); … … 79 98 private System.Windows.Forms.ComboBox classifierComboBox; 80 99 private System.Windows.Forms.Label label1; 100 private System.Windows.Forms.CheckBox displayDetailsCheckBox; 81 101 82 102 } -
branches/HeuristicLab.Problems.Orienteering/HeuristicLab.DataPreprocessing.Views/3.4/HistogramView.cs
r11098 r12694 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 70 70 71 71 Content.ClassifierVariableIndex = classifierComboBox.SelectedIndex; 72 73 GenerateChart(); 72 if (Content.IsDetailedChartViewEnabled != IsDetailedChartViewEnabled) { 73 displayDetailsCheckBox.Checked = Content.IsDetailedChartViewEnabled; 74 } else { 75 GenerateChart(); 76 } 77 } 78 private void displayDetailsCheckBox_CheckedChanged(object sender, EventArgs e) { 79 bool isChecked = displayDetailsCheckBox.Checked; 80 if (IsDetailedChartViewEnabled != isChecked) { 81 IsDetailedChartViewEnabled = isChecked; 82 Content.IsDetailedChartViewEnabled = isChecked; 83 GenerateChart(); 84 } 74 85 } 75 86 } -
branches/HeuristicLab.Problems.Orienteering/HeuristicLab.DataPreprocessing.Views/3.4/LineChartView.cs
r11185 r12694 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/HeuristicLab.Problems.Orienteering/HeuristicLab.DataPreprocessing.Views/3.4/ManipulationView.Designer.cs
r10977 r12694 49 49 this.label10 = new System.Windows.Forms.Label(); 50 50 this.tabDataShuffle = new System.Windows.Forms.TabPage(); 51 this.label6 = new System.Windows.Forms.Label(); 51 this.shuffleSeparatelyCheckbox = new System.Windows.Forms.CheckBox(); 52 this.lblShuffleProperties = new System.Windows.Forms.Label(); 52 53 this.grpBoxPreview = new System.Windows.Forms.GroupBox(); 53 54 this.tabsPreview = new System.Windows.Forms.TabControl(); … … 66 67 this.lblPreviewShuffle = new System.Windows.Forms.Label(); 67 68 this.label9 = new System.Windows.Forms.Label(); 69 this.panel1 = new System.Windows.Forms.Panel(); 70 this.panel2 = new System.Windows.Forms.Panel(); 68 71 this.grpBoxData.SuspendLayout(); 69 72 this.tabsData.SuspendLayout(); … … 82 85 this.tabPreviewReplaceMissingValues.SuspendLayout(); 83 86 this.tabPreviewShuffle.SuspendLayout(); 87 this.panel1.SuspendLayout(); 88 this.panel2.SuspendLayout(); 84 89 this.SuspendLayout(); 85 90 // … … 89 94 | System.Windows.Forms.AnchorStyles.Right))); 90 95 this.lstMethods.FormattingEnabled = true; 96 this.lstMethods.ItemHeight = 16; 91 97 this.lstMethods.Items.AddRange(new object[] { 92 98 "Delete Columns with insufficient Information", … … 95 101 "Replace Missing Values", 96 102 "Shuffle Data"}); 97 this.lstMethods.Location = new System.Drawing.Point(3, 3); 103 this.lstMethods.Location = new System.Drawing.Point(4, 4); 104 this.lstMethods.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); 98 105 this.lstMethods.Name = "lstMethods"; 99 this.lstMethods.Size = new System.Drawing.Size( 733, 95);106 this.lstMethods.Size = new System.Drawing.Size(976, 116); 100 107 this.lstMethods.Sorted = true; 101 108 this.lstMethods.TabIndex = 0; … … 106 113 this.btnApply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); 107 114 this.btnApply.Enabled = false; 108 this.btnApply.Location = new System.Drawing.Point(603, 500); 115 this.btnApply.Location = new System.Drawing.Point(804, 615); 116 this.btnApply.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); 109 117 this.btnApply.Name = "btnApply"; 110 this.btnApply.Size = new System.Drawing.Size(1 29, 23);118 this.btnApply.Size = new System.Drawing.Size(172, 28); 111 119 this.btnApply.TabIndex = 2; 112 120 this.btnApply.Text = "Apply Manipulation"; … … 119 127 | System.Windows.Forms.AnchorStyles.Right))); 120 128 this.grpBoxData.Controls.Add(this.tabsData); 121 this.grpBoxData.Location = new System.Drawing.Point(4, 105); 129 this.grpBoxData.Location = new System.Drawing.Point(5, 129); 130 this.grpBoxData.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); 122 131 this.grpBoxData.Name = "grpBoxData"; 123 this.grpBoxData.Size = new System.Drawing.Size(732, 189); 132 this.grpBoxData.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); 133 this.grpBoxData.Size = new System.Drawing.Size(976, 233); 124 134 this.grpBoxData.TabIndex = 3; 125 135 this.grpBoxData.TabStop = false; … … 137 147 this.tabsData.Controls.Add(this.tabDataShuffle); 138 148 this.tabsData.ItemSize = new System.Drawing.Size(58, 18); 139 this.tabsData.Location = new System.Drawing.Point(6, 19); 149 this.tabsData.Location = new System.Drawing.Point(8, 23); 150 this.tabsData.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); 140 151 this.tabsData.Name = "tabsData"; 141 152 this.tabsData.SelectedIndex = 0; 142 this.tabsData.Size = new System.Drawing.Size( 719, 164);153 this.tabsData.Size = new System.Drawing.Size(959, 202); 143 154 this.tabsData.TabIndex = 3; 144 155 // … … 147 158 this.tabPage1.Controls.Add(this.label7); 148 159 this.tabPage1.Location = new System.Drawing.Point(4, 22); 160 this.tabPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); 149 161 this.tabPage1.Name = "tabPage1"; 150 this.tabPage1.Padding = new System.Windows.Forms.Padding( 3);151 this.tabPage1.Size = new System.Drawing.Size( 711, 138);162 this.tabPage1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); 163 this.tabPage1.Size = new System.Drawing.Size(951, 176); 152 164 this.tabPage1.TabIndex = 5; 153 165 this.tabPage1.Text = "tabDataInactive"; … … 158 170 this.label7.AutoSize = true; 159 171 this.label7.Enabled = false; 160 this.label7.Location = new System.Drawing.Point(3, 3); 172 this.label7.Location = new System.Drawing.Point(4, 4); 173 this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); 161 174 this.label7.Name = "label7"; 162 this.label7.Size = new System.Drawing.Size( 259, 13);175 this.label7.Size = new System.Drawing.Size(345, 17); 163 176 this.label7.TabIndex = 1; 164 177 this.label7.Text = "Please select one of the manipulation methods above"; … … 170 183 this.tabDataDeleteColumnsInformation.Controls.Add(this.label1); 171 184 this.tabDataDeleteColumnsInformation.Location = new System.Drawing.Point(4, 22); 185 this.tabDataDeleteColumnsInformation.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); 172 186 this.tabDataDeleteColumnsInformation.Name = "tabDataDeleteColumnsInformation"; 173 this.tabDataDeleteColumnsInformation.Padding = new System.Windows.Forms.Padding( 3);174 this.tabDataDeleteColumnsInformation.Size = new System.Drawing.Size( 711, 138);187 this.tabDataDeleteColumnsInformation.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); 188 this.tabDataDeleteColumnsInformation.Size = new System.Drawing.Size(951, 176); 175 189 this.tabDataDeleteColumnsInformation.TabIndex = 0; 176 190 this.tabDataDeleteColumnsInformation.Text = "del columns info"; … … 180 194 // 181 195 this.label2.AutoSize = true; 182 this.label2.Location = new System.Drawing.Point(204, 3); 196 this.label2.Location = new System.Drawing.Point(272, 4); 197 this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); 183 198 this.label2.Name = "label2"; 184 this.label2.Size = new System.Drawing.Size( 89, 13);199 this.label2.Size = new System.Drawing.Size(120, 17); 185 200 this.label2.TabIndex = 5; 186 201 this.label2.Text = "% missing values."; … … 188 203 // txtDeleteColumnsInfo 189 204 // 190 this.txtDeleteColumnsInfo.Location = new System.Drawing.Point(164, 0); 205 this.txtDeleteColumnsInfo.Location = new System.Drawing.Point(219, 0); 206 this.txtDeleteColumnsInfo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); 191 207 this.txtDeleteColumnsInfo.Name = "txtDeleteColumnsInfo"; 192 this.txtDeleteColumnsInfo.Size = new System.Drawing.Size( 34, 20);208 this.txtDeleteColumnsInfo.Size = new System.Drawing.Size(44, 22); 193 209 this.txtDeleteColumnsInfo.TabIndex = 4; 194 210 this.txtDeleteColumnsInfo.TextChanged += new System.EventHandler(this.txtDeleteColumnsInfo_TextChanged); … … 197 213 // 198 214 this.label1.AutoSize = true; 199 this.label1.Location = new System.Drawing.Point(3, 3); 215 this.label1.Location = new System.Drawing.Point(4, 4); 216 this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); 200 217 this.label1.Name = "label1"; 201 this.label1.Size = new System.Drawing.Size( 155, 13);218 this.label1.Size = new System.Drawing.Size(205, 17); 202 219 this.label1.TabIndex = 3; 203 220 this.label1.Text = "Delete columns with more than "; … … 208 225 this.tabDataDeleteColumnsVariance.Controls.Add(this.label4); 209 226 this.tabDataDeleteColumnsVariance.Location = new System.Drawing.Point(4, 22); 227 this.tabDataDeleteColumnsVariance.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); 210 228 this.tabDataDeleteColumnsVariance.Name = "tabDataDeleteColumnsVariance"; 211 this.tabDataDeleteColumnsVariance.Padding = new System.Windows.Forms.Padding( 3);212 this.tabDataDeleteColumnsVariance.Size = new System.Drawing.Size( 711, 138);229 this.tabDataDeleteColumnsVariance.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); 230 this.tabDataDeleteColumnsVariance.Size = new System.Drawing.Size(951, 176); 213 231 this.tabDataDeleteColumnsVariance.TabIndex = 1; 214 232 this.tabDataDeleteColumnsVariance.Text = "del columns variance"; … … 217 235 // txtDeleteColumnsVariance 218 236 // 219 this.txtDeleteColumnsVariance.Location = new System.Drawing.Point(229, 0); 237 this.txtDeleteColumnsVariance.Location = new System.Drawing.Point(305, 0); 238 this.txtDeleteColumnsVariance.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); 220 239 this.txtDeleteColumnsVariance.Name = "txtDeleteColumnsVariance"; 221 this.txtDeleteColumnsVariance.Size = new System.Drawing.Size(1 35, 20);240 this.txtDeleteColumnsVariance.Size = new System.Drawing.Size(179, 22); 222 241 this.txtDeleteColumnsVariance.TabIndex = 4; 223 242 this.txtDeleteColumnsVariance.TextChanged += new System.EventHandler(this.txtDeleteColumnsVariance_TextChanged); … … 226 245 // 227 246 this.label4.AutoSize = true; 228 this.label4.Location = new System.Drawing.Point(3, 3); 247 this.label4.Location = new System.Drawing.Point(4, 4); 248 this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); 229 249 this.label4.Name = "label4"; 230 this.label4.Size = new System.Drawing.Size(2 20, 13);250 this.label4.Size = new System.Drawing.Size(292, 17); 231 251 this.label4.TabIndex = 3; 232 252 this.label4.Text = "Delete columns with a variance smaller than "; … … 238 258 this.tabDataDeleteRowsInfo.Controls.Add(this.label5); 239 259 this.tabDataDeleteRowsInfo.Location = new System.Drawing.Point(4, 22); 260 this.tabDataDeleteRowsInfo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); 240 261 this.tabDataDeleteRowsInfo.Name = "tabDataDeleteRowsInfo"; 241 this.tabDataDeleteRowsInfo.Padding = new System.Windows.Forms.Padding( 3);242 this.tabDataDeleteRowsInfo.Size = new System.Drawing.Size( 711, 138);262 this.tabDataDeleteRowsInfo.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); 263 this.tabDataDeleteRowsInfo.Size = new System.Drawing.Size(951, 176); 243 264 this.tabDataDeleteRowsInfo.TabIndex = 2; 244 265 this.tabDataDeleteRowsInfo.Text = "del rows info"; … … 248 269 // 249 270 this.label3.AutoSize = true; 250 this.label3.Location = new System.Drawing.Point(189, 3); 271 this.label3.Location = new System.Drawing.Point(252, 4); 272 this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); 251 273 this.label3.Name = "label3"; 252 this.label3.Size = new System.Drawing.Size( 89, 13);274 this.label3.Size = new System.Drawing.Size(120, 17); 253 275 this.label3.TabIndex = 8; 254 276 this.label3.Text = "% missing values."; … … 256 278 // txtDeleteRowsInfo 257 279 // 258 this.txtDeleteRowsInfo.Location = new System.Drawing.Point(147, 0); 280 this.txtDeleteRowsInfo.Location = new System.Drawing.Point(196, 0); 281 this.txtDeleteRowsInfo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); 259 282 this.txtDeleteRowsInfo.Name = "txtDeleteRowsInfo"; 260 this.txtDeleteRowsInfo.Size = new System.Drawing.Size( 34, 20);283 this.txtDeleteRowsInfo.Size = new System.Drawing.Size(44, 22); 261 284 this.txtDeleteRowsInfo.TabIndex = 7; 262 285 this.txtDeleteRowsInfo.TextChanged += new System.EventHandler(this.txtDeleteRowsInfo_TextChanged); … … 265 288 // 266 289 this.label5.AutoSize = true; 267 this.label5.Location = new System.Drawing.Point(3, 3); 290 this.label5.Location = new System.Drawing.Point(4, 4); 291 this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); 268 292 this.label5.Name = "label5"; 269 this.label5.Size = new System.Drawing.Size(1 38, 13);293 this.label5.Size = new System.Drawing.Size(182, 17); 270 294 this.label5.TabIndex = 6; 271 295 this.label5.Text = "Delete rows with more than "; … … 280 304 this.tabReplaceMissingValues.Controls.Add(this.label10); 281 305 this.tabReplaceMissingValues.Location = new System.Drawing.Point(4, 22); 306 this.tabReplaceMissingValues.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); 282 307 this.tabReplaceMissingValues.Name = "tabReplaceMissingValues"; 283 this.tabReplaceMissingValues.Padding = new System.Windows.Forms.Padding( 3);284 this.tabReplaceMissingValues.Size = new System.Drawing.Size( 711, 138);308 this.tabReplaceMissingValues.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); 309 this.tabReplaceMissingValues.Size = new System.Drawing.Size(951, 176); 285 310 this.tabReplaceMissingValues.TabIndex = 6; 286 311 this.tabReplaceMissingValues.Text = "repl missing vals"; … … 289 314 // txtReplaceValue 290 315 // 291 this.txtReplaceValue.Location = new System.Drawing.Point(173, 27); 316 this.txtReplaceValue.Location = new System.Drawing.Point(231, 33); 317 this.txtReplaceValue.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); 292 318 this.txtReplaceValue.Name = "txtReplaceValue"; 293 this.txtReplaceValue.Size = new System.Drawing.Size(1 00, 20);319 this.txtReplaceValue.Size = new System.Drawing.Size(132, 22); 294 320 this.txtReplaceValue.TabIndex = 2; 295 321 this.txtReplaceValue.TextChanged += new System.EventHandler(this.txtReplaceValue_TextChanged); … … 299 325 this.cmbVariableNames.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; 300 326 this.cmbVariableNames.FormattingEnabled = true; 301 this.cmbVariableNames.Location = new System.Drawing.Point(142, 0); 327 this.cmbVariableNames.Location = new System.Drawing.Point(189, 0); 328 this.cmbVariableNames.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); 302 329 this.cmbVariableNames.Name = "cmbVariableNames"; 303 this.cmbVariableNames.Size = new System.Drawing.Size(1 21, 21);330 this.cmbVariableNames.Size = new System.Drawing.Size(160, 24); 304 331 this.cmbVariableNames.TabIndex = 1; 305 332 this.cmbVariableNames.SelectedIndexChanged += new System.EventHandler(this.cmbReplaceWith_SelectedIndexChanged); … … 315 342 "Most Common", 316 343 "Random"}); 317 this.cmbReplaceWith.Location = new System.Drawing.Point(35, 27); 344 this.cmbReplaceWith.Location = new System.Drawing.Point(47, 33); 345 this.cmbReplaceWith.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); 318 346 this.cmbReplaceWith.Name = "cmbReplaceWith"; 319 this.cmbReplaceWith.Size = new System.Drawing.Size(1 21, 21);347 this.cmbReplaceWith.Size = new System.Drawing.Size(160, 24); 320 348 this.cmbReplaceWith.TabIndex = 1; 321 349 this.cmbReplaceWith.SelectedIndexChanged += new System.EventHandler(this.cmbReplaceWith_SelectedIndexChanged); … … 324 352 // 325 353 this.lblValueColon.AutoSize = true; 326 this.lblValueColon.Location = new System.Drawing.Point(157, 30); 354 this.lblValueColon.Location = new System.Drawing.Point(209, 37); 355 this.lblValueColon.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); 327 356 this.lblValueColon.Name = "lblValueColon"; 328 this.lblValueColon.Size = new System.Drawing.Size(1 0, 13);357 this.lblValueColon.Size = new System.Drawing.Size(12, 17); 329 358 this.lblValueColon.TabIndex = 0; 330 359 this.lblValueColon.Text = ":"; … … 333 362 // 334 363 this.label8.AutoSize = true; 335 this.label8.Location = new System.Drawing.Point(3, 30); 364 this.label8.Location = new System.Drawing.Point(4, 37); 365 this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); 336 366 this.label8.Name = "label8"; 337 this.label8.Size = new System.Drawing.Size( 26, 13);367 this.label8.Size = new System.Drawing.Size(32, 17); 338 368 this.label8.TabIndex = 0; 339 369 this.label8.Text = "with"; … … 342 372 // 343 373 this.label10.AutoSize = true; 344 this.label10.Location = new System.Drawing.Point(3, 3); 374 this.label10.Location = new System.Drawing.Point(4, 4); 375 this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); 345 376 this.label10.Name = "label10"; 346 this.label10.Size = new System.Drawing.Size(1 33, 13);377 this.label10.Size = new System.Drawing.Size(177, 17); 347 378 this.label10.TabIndex = 0; 348 379 this.label10.Text = "Replace missing values for"; … … 350 381 // tabDataShuffle 351 382 // 352 this.tabDataShuffle.Controls.Add(this.label6); 383 this.tabDataShuffle.Controls.Add(this.shuffleSeparatelyCheckbox); 384 this.tabDataShuffle.Controls.Add(this.lblShuffleProperties); 353 385 this.tabDataShuffle.Location = new System.Drawing.Point(4, 22); 386 this.tabDataShuffle.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); 354 387 this.tabDataShuffle.Name = "tabDataShuffle"; 355 this.tabDataShuffle.Padding = new System.Windows.Forms.Padding( 3);356 this.tabDataShuffle.Size = new System.Drawing.Size( 711, 138);388 this.tabDataShuffle.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); 389 this.tabDataShuffle.Size = new System.Drawing.Size(951, 176); 357 390 this.tabDataShuffle.TabIndex = 4; 358 391 this.tabDataShuffle.Text = "shuffle"; 359 392 this.tabDataShuffle.UseVisualStyleBackColor = true; 360 393 // 361 // label6 362 // 363 this.label6.AutoSize = true; 364 this.label6.Enabled = false; 365 this.label6.Location = new System.Drawing.Point(3, 3); 366 this.label6.Name = "label6"; 367 this.label6.Size = new System.Drawing.Size(115, 13); 368 this.label6.TabIndex = 0; 369 this.label6.Text = "No properties available"; 394 // shuffleSeparatelyCheckbox 395 // 396 this.shuffleSeparatelyCheckbox.AutoSize = true; 397 this.shuffleSeparatelyCheckbox.Location = new System.Drawing.Point(8, 2); 398 this.shuffleSeparatelyCheckbox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); 399 this.shuffleSeparatelyCheckbox.Name = "shuffleSeparatelyCheckbox"; 400 this.shuffleSeparatelyCheckbox.Size = new System.Drawing.Size(312, 21); 401 this.shuffleSeparatelyCheckbox.TabIndex = 1; 402 this.shuffleSeparatelyCheckbox.Text = "Shuffle training and test partitions separately"; 403 this.shuffleSeparatelyCheckbox.UseVisualStyleBackColor = true; 404 // 405 // lblShuffleProperties 406 // 407 this.lblShuffleProperties.AutoSize = true; 408 this.lblShuffleProperties.Enabled = false; 409 this.lblShuffleProperties.Location = new System.Drawing.Point(4, 4); 410 this.lblShuffleProperties.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); 411 this.lblShuffleProperties.Name = "lblShuffleProperties"; 412 this.lblShuffleProperties.Size = new System.Drawing.Size(154, 17); 413 this.lblShuffleProperties.TabIndex = 0; 414 this.lblShuffleProperties.Text = "No properties available"; 370 415 // 371 416 // grpBoxPreview … … 375 420 | System.Windows.Forms.AnchorStyles.Right))); 376 421 this.grpBoxPreview.Controls.Add(this.tabsPreview); 377 this.grpBoxPreview.Location = new System.Drawing.Point(4, 301); 422 this.grpBoxPreview.Location = new System.Drawing.Point(5, 370); 423 this.grpBoxPreview.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); 378 424 this.grpBoxPreview.Name = "grpBoxPreview"; 379 this.grpBoxPreview.Size = new System.Drawing.Size(732, 193); 425 this.grpBoxPreview.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); 426 this.grpBoxPreview.Size = new System.Drawing.Size(976, 238); 380 427 this.grpBoxPreview.TabIndex = 4; 381 428 this.grpBoxPreview.TabStop = false; … … 393 440 this.tabsPreview.Controls.Add(this.tabPreviewShuffle); 394 441 this.tabsPreview.ItemSize = new System.Drawing.Size(58, 18); 395 this.tabsPreview.Location = new System.Drawing.Point(6, 19); 442 this.tabsPreview.Location = new System.Drawing.Point(8, 23); 443 this.tabsPreview.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); 396 444 this.tabsPreview.Name = "tabsPreview"; 397 445 this.tabsPreview.SelectedIndex = 0; 398 this.tabsPreview.Size = new System.Drawing.Size( 719, 168);446 this.tabsPreview.Size = new System.Drawing.Size(959, 207); 399 447 this.tabsPreview.TabIndex = 3; 400 448 // … … 403 451 this.tabPreviewInactive.Controls.Add(this.lblPreviewInActive); 404 452 this.tabPreviewInactive.Location = new System.Drawing.Point(4, 22); 453 this.tabPreviewInactive.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); 405 454 this.tabPreviewInactive.Name = "tabPreviewInactive"; 406 this.tabPreviewInactive.Padding = new System.Windows.Forms.Padding( 3);407 this.tabPreviewInactive.Size = new System.Drawing.Size( 711, 142);455 this.tabPreviewInactive.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); 456 this.tabPreviewInactive.Size = new System.Drawing.Size(951, 181); 408 457 this.tabPreviewInactive.TabIndex = 5; 409 458 this.tabPreviewInactive.Text = "inactive"; … … 413 462 // 414 463 this.lblPreviewInActive.AutoSize = true; 415 this.lblPreviewInActive.Location = new System.Drawing.Point(3, 3); 464 this.lblPreviewInActive.Location = new System.Drawing.Point(4, 4); 465 this.lblPreviewInActive.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); 416 466 this.lblPreviewInActive.Name = "lblPreviewInActive"; 417 this.lblPreviewInActive.Size = new System.Drawing.Size( 361, 39);467 this.lblPreviewInActive.Size = new System.Drawing.Size(491, 51); 418 468 this.lblPreviewInActive.TabIndex = 2; 419 469 this.lblPreviewInActive.Text = "Filters are active and thus manipulations cannot be applied!\r\n\r\nPlease deactive t" + … … 423 473 // tabPreviewDeleteColumnsInfo 424 474 // 425 this.tabPreviewDeleteColumnsInfo.Controls.Add(this. lblPreviewColumnsInfo);475 this.tabPreviewDeleteColumnsInfo.Controls.Add(this.panel1); 426 476 this.tabPreviewDeleteColumnsInfo.Location = new System.Drawing.Point(4, 22); 477 this.tabPreviewDeleteColumnsInfo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); 427 478 this.tabPreviewDeleteColumnsInfo.Name = "tabPreviewDeleteColumnsInfo"; 428 this.tabPreviewDeleteColumnsInfo.Padding = new System.Windows.Forms.Padding( 3);429 this.tabPreviewDeleteColumnsInfo.Size = new System.Drawing.Size( 711, 142);479 this.tabPreviewDeleteColumnsInfo.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); 480 this.tabPreviewDeleteColumnsInfo.Size = new System.Drawing.Size(951, 181); 430 481 this.tabPreviewDeleteColumnsInfo.TabIndex = 0; 431 482 this.tabPreviewDeleteColumnsInfo.Text = "del columns info"; … … 435 486 // 436 487 this.lblPreviewColumnsInfo.AutoSize = true; 437 this.lblPreviewColumnsInfo.Location = new System.Drawing.Point(3, 3); 488 this.lblPreviewColumnsInfo.Dock = System.Windows.Forms.DockStyle.Left; 489 this.lblPreviewColumnsInfo.Location = new System.Drawing.Point(0, 0); 490 this.lblPreviewColumnsInfo.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); 438 491 this.lblPreviewColumnsInfo.Name = "lblPreviewColumnsInfo"; 439 this.lblPreviewColumnsInfo.Size = new System.Drawing.Size( 318, 13);492 this.lblPreviewColumnsInfo.Size = new System.Drawing.Size(423, 17); 440 493 this.lblPreviewColumnsInfo.TabIndex = 1; 441 494 this.lblPreviewColumnsInfo.Text = "{0} columns with more than {1} % missing values would be deleted"; … … 443 496 // tabPreviewDeleteColumnsVariance 444 497 // 498 this.tabPreviewDeleteColumnsVariance.Controls.Add(this.panel2); 445 499 this.tabPreviewDeleteColumnsVariance.Controls.Add(this.label12); 446 this.tabPreviewDeleteColumnsVariance.Controls.Add(this.lblPreviewColumnsVariance);447 500 this.tabPreviewDeleteColumnsVariance.Location = new System.Drawing.Point(4, 22); 501 this.tabPreviewDeleteColumnsVariance.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); 448 502 this.tabPreviewDeleteColumnsVariance.Name = "tabPreviewDeleteColumnsVariance"; 449 this.tabPreviewDeleteColumnsVariance.Padding = new System.Windows.Forms.Padding( 3);450 this.tabPreviewDeleteColumnsVariance.Size = new System.Drawing.Size( 711, 142);503 this.tabPreviewDeleteColumnsVariance.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); 504 this.tabPreviewDeleteColumnsVariance.Size = new System.Drawing.Size(951, 181); 451 505 this.tabPreviewDeleteColumnsVariance.TabIndex = 1; 452 506 this.tabPreviewDeleteColumnsVariance.Text = "del columns variance"; … … 456 510 // 457 511 this.label12.AutoSize = true; 458 this.label12.Location = new System.Drawing.Point(6, 22); 512 this.label12.Location = new System.Drawing.Point(8, 27); 513 this.label12.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); 459 514 this.label12.Name = "label12"; 460 this.label12.Size = new System.Drawing.Size(0, 1 3);515 this.label12.Size = new System.Drawing.Size(0, 17); 461 516 this.label12.TabIndex = 2; 462 517 // … … 464 519 // 465 520 this.lblPreviewColumnsVariance.AutoSize = true; 466 this.lblPreviewColumnsVariance.Location = new System.Drawing.Point(3, 3); 521 this.lblPreviewColumnsVariance.Dock = System.Windows.Forms.DockStyle.Left; 522 this.lblPreviewColumnsVariance.Location = new System.Drawing.Point(0, 0); 523 this.lblPreviewColumnsVariance.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); 467 524 this.lblPreviewColumnsVariance.Name = "lblPreviewColumnsVariance"; 468 this.lblPreviewColumnsVariance.Size = new System.Drawing.Size(3 01, 13);525 this.lblPreviewColumnsVariance.Size = new System.Drawing.Size(398, 17); 469 526 this.lblPreviewColumnsVariance.TabIndex = 2; 470 527 this.lblPreviewColumnsVariance.Text = "{0} columns with a variance smaller than {1} would be deleted."; … … 474 531 this.tabPreviewDeleteRowsInfo.Controls.Add(this.lblPreviewRowsInfo); 475 532 this.tabPreviewDeleteRowsInfo.Location = new System.Drawing.Point(4, 22); 533 this.tabPreviewDeleteRowsInfo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); 476 534 this.tabPreviewDeleteRowsInfo.Name = "tabPreviewDeleteRowsInfo"; 477 this.tabPreviewDeleteRowsInfo.Padding = new System.Windows.Forms.Padding( 3);478 this.tabPreviewDeleteRowsInfo.Size = new System.Drawing.Size( 711, 142);535 this.tabPreviewDeleteRowsInfo.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); 536 this.tabPreviewDeleteRowsInfo.Size = new System.Drawing.Size(951, 181); 479 537 this.tabPreviewDeleteRowsInfo.TabIndex = 2; 480 538 this.tabPreviewDeleteRowsInfo.Text = "del rows info"; … … 484 542 // 485 543 this.lblPreviewRowsInfo.AutoSize = true; 486 this.lblPreviewRowsInfo.Location = new System.Drawing.Point(3, 3); 544 this.lblPreviewRowsInfo.Location = new System.Drawing.Point(4, 4); 545 this.lblPreviewRowsInfo.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); 487 546 this.lblPreviewRowsInfo.Name = "lblPreviewRowsInfo"; 488 this.lblPreviewRowsInfo.Size = new System.Drawing.Size( 301, 13);547 this.lblPreviewRowsInfo.Size = new System.Drawing.Size(400, 17); 489 548 this.lblPreviewRowsInfo.TabIndex = 2; 490 549 this.lblPreviewRowsInfo.Text = "{0} rows with more than {1} % missing values would be deleted"; … … 494 553 this.tabPreviewReplaceMissingValues.Controls.Add(this.lblPreviewReplaceMissingValues); 495 554 this.tabPreviewReplaceMissingValues.Location = new System.Drawing.Point(4, 22); 555 this.tabPreviewReplaceMissingValues.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); 496 556 this.tabPreviewReplaceMissingValues.Name = "tabPreviewReplaceMissingValues"; 497 this.tabPreviewReplaceMissingValues.Padding = new System.Windows.Forms.Padding( 3);498 this.tabPreviewReplaceMissingValues.Size = new System.Drawing.Size( 711, 142);557 this.tabPreviewReplaceMissingValues.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); 558 this.tabPreviewReplaceMissingValues.Size = new System.Drawing.Size(951, 181); 499 559 this.tabPreviewReplaceMissingValues.TabIndex = 6; 500 560 this.tabPreviewReplaceMissingValues.Text = "repl missing vals"; … … 504 564 // 505 565 this.lblPreviewReplaceMissingValues.AutoSize = true; 506 this.lblPreviewReplaceMissingValues.Location = new System.Drawing.Point(3, 3); 566 this.lblPreviewReplaceMissingValues.Location = new System.Drawing.Point(4, 4); 567 this.lblPreviewReplaceMissingValues.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); 507 568 this.lblPreviewReplaceMissingValues.Name = "lblPreviewReplaceMissingValues"; 508 this.lblPreviewReplaceMissingValues.Size = new System.Drawing.Size( 343, 13);569 this.lblPreviewReplaceMissingValues.Size = new System.Drawing.Size(449, 17); 509 570 this.lblPreviewReplaceMissingValues.TabIndex = 3; 510 571 this.lblPreviewReplaceMissingValues.Text = "{0} cells detected with missing values which would be replaced with {1}"; … … 514 575 this.tabPreviewShuffle.Controls.Add(this.lblPreviewShuffle); 515 576 this.tabPreviewShuffle.Location = new System.Drawing.Point(4, 22); 577 this.tabPreviewShuffle.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); 516 578 this.tabPreviewShuffle.Name = "tabPreviewShuffle"; 517 this.tabPreviewShuffle.Padding = new System.Windows.Forms.Padding( 3);518 this.tabPreviewShuffle.Size = new System.Drawing.Size( 711, 142);579 this.tabPreviewShuffle.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); 580 this.tabPreviewShuffle.Size = new System.Drawing.Size(951, 181); 519 581 this.tabPreviewShuffle.TabIndex = 4; 520 582 this.tabPreviewShuffle.Text = "shuffle"; … … 524 586 // 525 587 this.lblPreviewShuffle.AutoSize = true; 526 this.lblPreviewShuffle.Location = new System.Drawing.Point(3, 3); 588 this.lblPreviewShuffle.Location = new System.Drawing.Point(4, 4); 589 this.lblPreviewShuffle.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); 527 590 this.lblPreviewShuffle.Name = "lblPreviewShuffle"; 528 this.lblPreviewShuffle.Size = new System.Drawing.Size( 252, 13);591 this.lblPreviewShuffle.Size = new System.Drawing.Size(337, 17); 529 592 this.lblPreviewShuffle.TabIndex = 0; 530 593 this.lblPreviewShuffle.Text = "Data will be shuffled randomly - preview not possible"; … … 537 600 this.label9.TabIndex = 0; 538 601 // 602 // panel1 603 // 604 this.panel1.AutoScroll = true; 605 this.panel1.Controls.Add(this.lblPreviewColumnsInfo); 606 this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; 607 this.panel1.Location = new System.Drawing.Point(4, 4); 608 this.panel1.Name = "panel1"; 609 this.panel1.Size = new System.Drawing.Size(943, 173); 610 this.panel1.TabIndex = 2; 611 // 612 // panel2 613 // 614 this.panel2.AutoScroll = true; 615 this.panel2.Controls.Add(this.lblPreviewColumnsVariance); 616 this.panel2.Dock = System.Windows.Forms.DockStyle.Fill; 617 this.panel2.Location = new System.Drawing.Point(4, 4); 618 this.panel2.Name = "panel2"; 619 this.panel2.Size = new System.Drawing.Size(943, 173); 620 this.panel2.TabIndex = 3; 621 // 539 622 // ManipulationView 540 623 // 541 this.AutoScaleDimensions = new System.Drawing.SizeF( 6F, 13F);624 this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F); 542 625 this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; 543 626 this.Controls.Add(this.btnApply); … … 545 628 this.Controls.Add(this.grpBoxData); 546 629 this.Controls.Add(this.lstMethods); 630 this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); 547 631 this.Name = "ManipulationView"; 548 this.Size = new System.Drawing.Size( 739, 529);632 this.Size = new System.Drawing.Size(985, 651); 549 633 this.grpBoxData.ResumeLayout(false); 550 634 this.tabsData.ResumeLayout(false); … … 566 650 this.tabPreviewInactive.PerformLayout(); 567 651 this.tabPreviewDeleteColumnsInfo.ResumeLayout(false); 568 this.tabPreviewDeleteColumnsInfo.PerformLayout();569 652 this.tabPreviewDeleteColumnsVariance.ResumeLayout(false); 570 653 this.tabPreviewDeleteColumnsVariance.PerformLayout(); … … 575 658 this.tabPreviewShuffle.ResumeLayout(false); 576 659 this.tabPreviewShuffle.PerformLayout(); 660 this.panel1.ResumeLayout(false); 661 this.panel1.PerformLayout(); 662 this.panel2.ResumeLayout(false); 663 this.panel2.PerformLayout(); 577 664 this.ResumeLayout(false); 578 665 … … 619 706 private System.Windows.Forms.Label label10; 620 707 private System.Windows.Forms.TabPage tabDataShuffle; 621 private System.Windows.Forms.Label l abel6;708 private System.Windows.Forms.Label lblShuffleProperties; 622 709 private System.Windows.Forms.ComboBox cmbVariableNames; 623 710 private System.Windows.Forms.Label label8; 624 711 private System.Windows.Forms.Label lblPreviewInActive; 712 private System.Windows.Forms.CheckBox shuffleSeparatelyCheckbox; 713 private System.Windows.Forms.Panel panel1; 714 private System.Windows.Forms.Panel panel2; 625 715 } 626 716 } -
branches/HeuristicLab.Problems.Orienteering/HeuristicLab.DataPreprocessing.Views/3.4/ManipulationView.cs
r11185 r12694 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 23 23 using System.Collections.Generic; 24 24 using System.Drawing; 25 using System.Globalization; 26 using System.Linq; 27 using System.Text; 25 28 using System.Windows.Forms; 26 29 using HeuristicLab.Core.Views; … … 51 54 ()=>validateDeleteRowsInfo(), 52 55 ()=>validateReplaceWith(), 53 ()=> {btnApply.Enabled = true; lblPreviewShuffle.Text = "Data will be shuffled randomly - preview not possible";} //shuffle56 ()=>validateShuffle() 54 57 }; 55 58 … … 59 62 ()=>Content.ManipulationLogic.DeleteRowsWithMissingValuesGreater(getRowsColumnsInfo()), 60 63 ()=>replaceMissingValues(), 61 ()=>Content.ManipulationLogic.Shuffle WithRanges()64 ()=>Content.ManipulationLogic.Shuffle(shuffleSeparatelyCheckbox.Checked) 62 65 }; 63 64 66 } 65 67 … … 150 152 validateDoubleTextBox(txtDeleteColumnsInfo.Text); 151 153 if (btnApply.Enabled) { 152 int count = Content.ManipulationLogic.ColumnsWithMissingValuesGreater(getDeleteColumnsInfo()).Count; 153 int rowCount = Content.FilterLogic.PreprocessingData.Rows; 154 lblPreviewColumnsInfo.Text = count + " column" + (count > 1 || count == 0 ? "s" : "") + " of " + rowCount + " (" + string.Format("{0:F2}%", 100d / rowCount * count) + ") were detected with more than " + txtDeleteColumnsInfo.Text + "% missing values."; 154 var filteredColumns = Content.ManipulationLogic.ColumnsWithMissingValuesGreater(getDeleteColumnsInfo()); 155 int count = filteredColumns.Count; 156 int columnCount = Content.FilterLogic.PreprocessingData.Columns; 157 lblPreviewColumnsInfo.Text = count + " column" + (count > 1 || count == 0 ? "s" : "") + " of " + columnCount + " (" + string.Format("{0:F2}%", 100d / columnCount * count) + ") were detected with more than " + txtDeleteColumnsInfo.Text + "% missing values."; 155 158 if (count > 0) { 156 lblPreviewColumnsInfo.Text += Environment.NewLine + Environment.NewLine + "Please press the button \"Apply Manipulation\" if you wish to delete those columns."; 159 StringBuilder sb = new StringBuilder(); 160 sb.Append(Environment.NewLine); 161 sb.Append("Columns: "); 162 sb.Append(Content.SearchLogic.VariableNames.ElementAt(filteredColumns.ElementAt(0))); 163 for (int i = 1; i < filteredColumns.Count; i++) { 164 string columnName = Content.SearchLogic.VariableNames.ElementAt(filteredColumns.ElementAt(i)); 165 sb.Append(", "); 166 sb.Append(columnName); 167 } 168 sb.Append(Environment.NewLine); 169 sb.Append("Please press the button \"Apply Manipulation\" if you wish to delete those columns."); 170 171 lblPreviewColumnsInfo.Text += sb.ToString(); 157 172 } else { 158 173 btnApply.Enabled = false; … … 166 181 validateDoubleTextBox(txtDeleteColumnsVariance.Text); 167 182 if (btnApply.Enabled) { 168 int count = Content.ManipulationLogic.ColumnsWithVarianceSmaller(getDeleteColumnsVariance()).Count; 169 int rowCount = Content.FilterLogic.PreprocessingData.Rows; 170 lblPreviewColumnsVariance.Text = count + " column" + (count > 1 || count == 0 ? "s" : "") + " of " + rowCount + " (" + string.Format("{0:F2}%", 100d / rowCount * count) + ") were detected with a variance smaller than " + txtDeleteColumnsVariance.Text + "."; 183 var filteredColumns = Content.ManipulationLogic.ColumnsWithVarianceSmaller(getDeleteColumnsVariance()); 184 int count = filteredColumns.Count; 185 int columnCount = Content.FilterLogic.PreprocessingData.Columns; 186 lblPreviewColumnsVariance.Text = count + " column" + (count > 1 || count == 0 ? "s" : "") + " of " + columnCount + " (" + string.Format("{0:F2}%", 100d / columnCount * count) + ") were detected with a variance smaller than " + txtDeleteColumnsVariance.Text + "."; 171 187 if (count > 0) { 172 lblPreviewColumnsVariance.Text += Environment.NewLine + Environment.NewLine + "Please press the button \"Apply Manipulation\" if you wish to delete those columns."; 188 StringBuilder sb = new StringBuilder(); 189 sb.Append(Environment.NewLine); 190 sb.Append("Columns: "); 191 sb.Append(Content.SearchLogic.VariableNames.ElementAt(filteredColumns.ElementAt(0))); 192 for (int i = 1; i < filteredColumns.Count; i++) { 193 string columnName = Content.SearchLogic.VariableNames.ElementAt(filteredColumns.ElementAt(i)); 194 sb.Append(", "); 195 sb.Append(columnName); 196 } 197 sb.Append(Environment.NewLine); 198 sb.Append("Please press the button \"Apply Manipulation\" if you wish to delete those columns."); 199 200 lblPreviewColumnsVariance.Text += sb.ToString(); 173 201 } else { 174 202 btnApply.Enabled = false; … … 228 256 } 229 257 258 private void validateShuffle() { 259 btnApply.Enabled = true; 260 lblShuffleProperties.Enabled = false; 261 lblShuffleProperties.Visible = false; 262 shuffleSeparatelyCheckbox.Enabled = true; 263 shuffleSeparatelyCheckbox.Visible = true; 264 } 265 230 266 public new ManipulationContent Content { 231 267 get { return (ManipulationContent)base.Content; } … … 272 308 if (!string.IsNullOrEmpty(text)) { 273 309 double percent; 274 if (Double.TryParse(text, out percent)) {310 if (Double.TryParse(text, NumberStyles.Number ^ NumberStyles.AllowThousands, CultureInfo.CurrentCulture, out percent)) { 275 311 btnApply.Enabled = true; 276 312 } -
branches/HeuristicLab.Problems.Orienteering/HeuristicLab.DataPreprocessing.Views/3.4/Plugin.cs.frame
r11185 r12694 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 26 26 /// Plugin class for HeuristicLab.Data plugin. 27 27 /// </summary> 28 [Plugin("HeuristicLab.DataPreprocessing.Views", "3.4. 0.$WCREV$")]28 [Plugin("HeuristicLab.DataPreprocessing.Views", "3.4.1.$WCREV$")] 29 29 [PluginFile("HeuristicLab.DataPreprocessing.Views-3.4.dll", PluginFileType.Assembly)] 30 30 [PluginDependency("HeuristicLab.Analysis", "3.3")] -
branches/HeuristicLab.Problems.Orienteering/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingChartView.Designer.cs
r11185 r12694 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/HeuristicLab.Problems.Orienteering/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingChartView.cs
r11185 r12694 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 22 22 using System; 23 23 using System.Collections.Generic; 24 using System.Linq; 24 25 using System.Windows.Forms; 25 26 using HeuristicLab.Analysis; … … 49 50 50 51 public IEnumerable<double> Classification { get; set; } 52 public bool IsDetailedChartViewEnabled { get; set; } 51 53 52 54 public PreprocessingChartView() { … … 59 61 //Add or remove data row 60 62 private void CheckedItemsChanged(object sender, CollectionItemsChangedEventArgs<IndexedItem<StringValue>> checkedItems) { 63 61 64 foreach (IndexedItem<StringValue> item in checkedItems.Items) { 62 65 string variableName = item.Value.Value; … … 121 124 if (Content.VariableItemList == null) { 122 125 Content.VariableItemList = Content.CreateVariableItemList(); 126 } else { 127 var checkedNames = Content.VariableItemList.CheckedItems.Select(x => x.Value.Value); 128 Content.VariableItemList = Content.CreateVariableItemList(checkedNames); 123 129 } 124 130 checkedItemList.Content = Content.VariableItemList; … … 135 141 DataRow row = GetDataRow(variableName); 136 142 137 //add row to data table 138 dataTable.Rows.Add(row); 139 140 //add row to data table per variable 141 d.Rows.Add(row); 142 dataTablePerVariable.Add(d); 143 if (row != null) { 144 //add row to data table 145 dataTable.Rows.Add(row); 146 147 //add row to data table per variable 148 d.Rows.Add(row); 149 dataTablePerVariable.Add(d); 150 } 143 151 } 144 152 … … 152 160 dataTable.SelectedRows.Clear(); 153 161 foreach (var selectedRow in selectedDataRows) { 154 if (VariableIsDisplayed(selectedRow.Name))162 if (VariableIsDisplayed(selectedRow.Name)) 155 163 dataTable.SelectedRows.Add(selectedRow); 156 164 } … … 354 362 PreprocessingDataTableView dataView = new PreprocessingDataTableView(); 355 363 dataView.Classification = Classification; 364 dataView.IsDetailedChartViewEnabled = IsDetailedChartViewEnabled; 356 365 357 366 if (dataTable == null) { -
branches/HeuristicLab.Problems.Orienteering/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingCheckedItemListView.Designer.cs
r11185 r12694 2 2 3 3 /* HeuristicLab 4 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)4 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 5 5 * 6 6 * This file is part of HeuristicLab. -
branches/HeuristicLab.Problems.Orienteering/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingCheckedItemListView.cs
r11185 r12694 2 2 3 3 /* HeuristicLab 4 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)4 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 5 5 * 6 6 * This file is part of HeuristicLab. -
branches/HeuristicLab.Problems.Orienteering/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingDataTableView.Designer.cs
r11185 r12694 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/HeuristicLab.Problems.Orienteering/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingDataTableView.cs
r11185 r12694 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 47 47 48 48 public IEnumerable<double> Classification { get; set; } 49 public bool IsDetailedChartViewEnabled { get; set; } 49 50 50 51 public PreprocessingDataTableView() { … … 145 146 RegisterDataRowEvents(row); 146 147 var series = new Series(row.Name); 147 if (row.VisualProperties.DisplayName.Trim() != String.Empty) series.LegendText = row.VisualProperties.DisplayName; 148 if (row.VisualProperties.DisplayName.Trim() != String.Empty) 149 series.LegendText = row.VisualProperties.DisplayName; 148 150 else series.LegendText = row.Name; 151 149 152 ConfigureSeries(series, row); 150 153 FillSeriesWithRowValues(series, row); 151 154 155 if (IsDetailedChartViewEnabled) { 156 series.LegendText += " Values: " + row.Values.Count; 157 } 152 158 if (Classification == null) 153 159 chart.Series.Add(series); … … 661 667 662 668 chart.Titles.Add(row.Name); 663 669 int featureOverallValueCount = 0; 670 if (IsDetailedChartViewEnabled) 671 featureOverallValueCount = row.Values.Count(x => !IsInvalidValue(x)); 664 672 foreach (KeyValuePair<double, List<double>> entry in valuesPerClass) { 665 673 var s = new Series(row.Name + entry.Key); … … 669 677 670 678 s.LegendText = entry.Key.ToString(); 671 679 if (IsDetailedChartViewEnabled) { 680 int featureValueCount = entry.Value.Count(x => !IsInvalidValue(x)); 681 s.LegendText += " Values: "; 682 s.LegendText += (featureOverallValueCount > 0) ? 683 string.Format("{0} ({1:F2}%)", featureValueCount, (featureValueCount / (double)featureOverallValueCount) * 100) 684 : "0"; 685 } 672 686 chart.Series.Add(s); 673 687 } … … 752 766 ? "Y" 753 767 : Content.VisualProperties.YAxisTitle; 754 series.Points.Add(new DataPoint(d - intervalCenter, sum) { 755 ToolTip = 756 xAxisTitle + ": [" + (d - intervalWidth) + "-" + d + ")" + Environment.NewLine + 757 yAxisTitle + ": " + sum 758 }); 768 DataPoint newDataPoint = new DataPoint(d - intervalCenter, sum); 769 newDataPoint.ToolTip = 770 xAxisTitle + ": [" + (d - intervalWidth) + "-" + d + ")" + Environment.NewLine + 771 yAxisTitle + ": " + sum; 772 int overallValueCount = row.Values.Count(); 773 if (overallValueCount > 0) 774 newDataPoint.ToolTip += string.Format(" ({0:F2}%)", (sum / overallValueCount) * 100); 775 series.Points.Add(newDataPoint); 759 776 } 760 777 } -
branches/HeuristicLab.Problems.Orienteering/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingFeatureCorrelationView.Designer.cs
r11185 r12694 2 2 3 3 /* HeuristicLab 4 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)4 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 5 5 * 6 6 * This file is part of HeuristicLab. -
branches/HeuristicLab.Problems.Orienteering/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingFeatureCorrelationView.cs
r11185 r12694 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/HeuristicLab.Problems.Orienteering/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingScatterPlotView.Designer.cs
r11185 r12694 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/HeuristicLab.Problems.Orienteering/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingScatterPlotView.cs
r11185 r12694 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/HeuristicLab.Problems.Orienteering/HeuristicLab.DataPreprocessing.Views/3.4/Properties/AssemblyInfo.cs.frame
r10925 r12694 1 using System.Reflection; 1 #region License Information 2 /* HeuristicLab 3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 * 5 * This file is part of HeuristicLab. 6 * 7 * HeuristicLab is free software: you can redistribute it and/or modify 8 * it under the terms of the GNU General Public License as published by 9 * the Free Software Foundation, either version 3 of the License, or 10 * (at your option) any later version. 11 * 12 * HeuristicLab is distributed in the hope that it will be useful, 13 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * GNU General Public License for more details. 16 * 17 * You should have received a copy of the GNU General Public License 18 * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>. 19 */ 20 #endregion 21 22 using System.Reflection; 2 23 using System.Runtime.CompilerServices; 3 24 using System.Runtime.InteropServices; … … 9 30 [assembly: AssemblyDescription("")] 10 31 [assembly: AssemblyConfiguration("")] 11 [assembly: AssemblyCompany(" FH-Hagenberg")]12 [assembly: AssemblyProduct("HeuristicLab .DataPreprocessing.Views")]13 [assembly: AssemblyCopyright(" Copyright © FH-Hagenberg 2014")]32 [assembly: AssemblyCompany("HEAL")] 33 [assembly: AssemblyProduct("HeuristicLab")] 34 [assembly: AssemblyCopyright("(c) 2002-2015 HEAL")] 14 35 [assembly: AssemblyTrademark("")] 15 36 [assembly: AssemblyCulture("")] … … 34 55 // [assembly: AssemblyVersion("1.0.*")] 35 56 [assembly: AssemblyVersion("3.4.0.0")] 36 [assembly: AssemblyFileVersion("3.4. 0.$WCREV$")]57 [assembly: AssemblyFileVersion("3.4.1.$WCREV$")] -
branches/HeuristicLab.Problems.Orienteering/HeuristicLab.DataPreprocessing.Views/3.4/StatisticsView.Designer.cs
r11185 r12694 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/HeuristicLab.Problems.Orienteering/HeuristicLab.DataPreprocessing.Views/3.4/StatisticsView.cs
r11185 r12694 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 166 166 "", //standard deviation 167 167 "", //variance 168 logic.GetMostCommonValue<string>(columnIndex) .ToString(),168 logic.GetMostCommonValue<string>(columnIndex) ?? "", 169 169 logic.GetDifferentValuesCount<string>(columnIndex).ToString() 170 170 }; -
branches/HeuristicLab.Problems.Orienteering/HeuristicLab.DataPreprocessing.Views/3.4/TransformationView.Designer.cs
r11185 r12694 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/HeuristicLab.Problems.Orienteering/HeuristicLab.DataPreprocessing.Views/3.4/TransformationView.cs
r11185 r12694 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/HeuristicLab.Problems.Orienteering/HeuristicLab.DataPreprocessing.Views/3.4/Utils/FindPreprocessingItemsIterator.cs
r11185 r12694 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/HeuristicLab.Problems.Orienteering/HeuristicLab.DataPreprocessing.Views/3.4/Utils/IFindPreprocessingItemsIterator.cs
r11185 r12694 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/HeuristicLab.Problems.Orienteering/HeuristicLab.DataPreprocessing.Views/3.4/ViewShortcutListView.Designer.cs
r11185 r12694 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/HeuristicLab.Problems.Orienteering/HeuristicLab.DataPreprocessing.Views/3.4/ViewShortcutListView.cs
r11185 r12694 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab.
Note: See TracChangeset
for help on using the changeset viewer.