Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
07/09/15 13:07:30 (9 years ago)
Author:
abeham
Message:

#2208: merged trunk changes

Location:
branches/HeuristicLab.Problems.Orienteering
Files:
37 edited

Legend:

Unmodified
Added
Removed
  • branches/HeuristicLab.Problems.Orienteering

  • branches/HeuristicLab.Problems.Orienteering/HeuristicLab.DataPreprocessing.Views

    • Property svn:mergeinfo set to (toggle deleted branches)
      /stable/HeuristicLab.DataPreprocessing.Viewsmergedeligible
      /trunk/sources/HeuristicLab.DataPreprocessing.Viewsmergedeligible
      /branches/1721-RandomForestPersistence/HeuristicLab.DataPreprocessing.Views10321-10322
      /branches/Algorithms.GradientDescent/HeuristicLab.DataPreprocessing.Views5516-5520
      /branches/Benchmarking/sources/HeuristicLab.DataPreprocessing.Views6917-7005
      /branches/CloningRefactoring/HeuristicLab.DataPreprocessing.Views4656-4721
      /branches/CodeEditor/HeuristicLab.DataPreprocessing.Views11700-11806
      /branches/DataAnalysis Refactoring/HeuristicLab.DataPreprocessing.Views5471-5808
      /branches/DataAnalysis SolutionEnsembles/HeuristicLab.DataPreprocessing.Views5815-6180
      /branches/DataAnalysis/HeuristicLab.DataPreprocessing.Views4458-4459,​4462,​4464
      /branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views10085-11101
      /branches/DataPreprocessingImprovements/HeuristicLab.DataPreprocessing.Views12054-12675
      /branches/GP.Grammar.Editor/HeuristicLab.DataPreprocessing.Views6284-6795
      /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.DataPreprocessing.Views5060
      /branches/HLScript/HeuristicLab.DataPreprocessing.Views10331-10358
      /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.DataPreprocessing.Views11570-12508
      /branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.DataPreprocessing.Views6123-9799
      /branches/LogResidualEvaluator/HeuristicLab.DataPreprocessing.Views10202-10483
      /branches/NET40/sources/HeuristicLab.DataPreprocessing.Views5138-5162
      /branches/NSGA-II Changes/HeuristicLab.DataPreprocessing.Views12033-12122
      /branches/ParallelEngine/HeuristicLab.DataPreprocessing.Views5175-5192
      /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.DataPreprocessing.Views7568-7810
      /branches/QAPAlgorithms/HeuristicLab.DataPreprocessing.Views6350-6627
      /branches/Restructure trunk solution/HeuristicLab.DataPreprocessing.Views6828
      /branches/RuntimeOptimizer/HeuristicLab.DataPreprocessing.Views8943-9078
      /branches/ScatterSearch (trunk integration)/HeuristicLab.DataPreprocessing.Views7787-8333
      /branches/SlaveShutdown/HeuristicLab.DataPreprocessing.Views8944-8956
      /branches/SpectralKernelForGaussianProcesses/HeuristicLab.DataPreprocessing.Views10204-10479
      /branches/SuccessProgressAnalysis/HeuristicLab.DataPreprocessing.Views5370-5682
      /branches/Trunk/HeuristicLab.DataPreprocessing.Views6829-6865
      /branches/UnloadJobs/HeuristicLab.DataPreprocessing.Views9168-9215
      /branches/VNS/HeuristicLab.DataPreprocessing.Views5594-5752
      /branches/histogram/HeuristicLab.DataPreprocessing.Views5959-6341
  • branches/HeuristicLab.Problems.Orienteering/HeuristicLab.DataPreprocessing.Views/3.4/CheckedTransformationListView.Designer.cs

    r11185 r12694  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/HeuristicLab.Problems.Orienteering/HeuristicLab.DataPreprocessing.Views/3.4/CheckedTransformationListView.cs

    r11185 r12694  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/HeuristicLab.Problems.Orienteering/HeuristicLab.DataPreprocessing.Views/3.4/ComparisonFilterView.Designer.cs

    r11185 r12694  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/HeuristicLab.Problems.Orienteering/HeuristicLab.DataPreprocessing.Views/3.4/ComparisonFilterView.cs

    r11185 r12694  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/HeuristicLab.Problems.Orienteering/HeuristicLab.DataPreprocessing.Views/3.4/DataGridContentView.Designer.cs

    r11185 r12694  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/HeuristicLab.Problems.Orienteering/HeuristicLab.DataPreprocessing.Views/3.4/DataGridContentView.cs

    r11185 r12694  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    6161      dataGridView.KeyDown += dataGridView_KeyDown;
    6262      dataGridView.MouseUp += dataGridView_MouseUp;
    63       dataGridView.ColumnHeaderMouseClick += dataGridView_ColumnHeaderMouseClick;
    6463      contextMenuCell.Items.Add(ShowHideColumns);
    6564      _highlightedCellsBackground = new Dictionary<int, IList<int>>();
     
    127126
    128127      string errorMessage;
    129       if (Content != null) {
     128      if (!String.IsNullOrEmpty(e.FormattedValue.ToString())) {
    130129        if (dataGridView.IsCurrentCellInEditMode && Content.FilterLogic.IsFiltered) {
    131130          errorMessage = "A filter is active, you cannot modify data. Press ESC to exit edit mode.";
     
    164163    }
    165164
    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      }
    167180      searchIterator = null;
    168181    }
     
    437450    private void dataGridView_CellMouseClick(object sender, DataGridViewCellMouseEventArgs e) {
    438451      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)) {
    440453        if (e.ColumnIndex == -1 || e.RowIndex == -1) {
    441454          replaceValueOverColumnToolStripMenuItem.Visible = false;
     
    474487    private void dataGridView_KeyDown(object sender, KeyEventArgs e) {
    475488      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        }
    488508      }
    489509    }
  • branches/HeuristicLab.Problems.Orienteering/HeuristicLab.DataPreprocessing.Views/3.4/DataPreprocessingView.cs

    r11185 r12694  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    4646      if (Content != null) {
    4747        var data = Content.Data;
    48         var searchLogic = new SearchLogic(data);
     48        var filterLogic = new FilterLogic(data);
     49        var searchLogic = new SearchLogic(data, filterLogic);
    4950        var statisticsLogic = new StatisticsLogic(data, searchLogic);
    5051        var manipulationLogic = new ManipulationLogic(data, searchLogic, statisticsLogic);
    51         var filterLogic = new FilterLogic(data);
    5252
    5353        var viewShortcuts = new ItemList<IViewShortcut> {
  • branches/HeuristicLab.Problems.Orienteering/HeuristicLab.DataPreprocessing.Views/3.4/DataPreprocessingView.designer.cs

    r11185 r12694  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/HeuristicLab.Problems.Orienteering/HeuristicLab.DataPreprocessing.Views/3.4/DataPreprocessorStarter.cs

    r11303 r12694  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    4444        IContentView contentView = control as IContentView;
    4545        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;
    4852        }
    4953        control = control.Parent;
  • branches/HeuristicLab.Problems.Orienteering/HeuristicLab.DataPreprocessing.Views/3.4/HeuristicLab.DataPreprocessing.Views-3.4.csproj

    r11116 r12694  
    1010    <RootNamespace>HeuristicLab.DataPreprocessing.Views</RootNamespace>
    1111    <AssemblyName>HeuristicLab.DataPreprocessing.Views-3.4</AssemblyName>
    12     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     12    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
    1313    <FileAlignment>512</FileAlignment>
    1414    <TargetFrameworkProfile />
     
    1818    <DebugType>full</DebugType>
    1919    <Optimize>false</Optimize>
    20     <OutputPath>..\..\bin\</OutputPath>
     20    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    2121    <DefineConstants>DEBUG;TRACE</DefineConstants>
    2222    <ErrorReport>prompt</ErrorReport>
    2323    <WarningLevel>4</WarningLevel>
    24     <UseVSHostingProcess>false</UseVSHostingProcess>
     24    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     25    <Prefer32Bit>false</Prefer32Bit>
    2526  </PropertyGroup>
    2627  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    2728    <DebugType>pdbonly</DebugType>
    2829    <Optimize>true</Optimize>
    29     <OutputPath>..\..\bin\</OutputPath>
     30    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    3031    <DefineConstants>TRACE</DefineConstants>
    3132    <ErrorReport>prompt</ErrorReport>
    3233    <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>
    3382  </PropertyGroup>
    3483  <PropertyGroup>
     
    272321  </ItemGroup>
    273322  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    274 <PropertyGroup>
     323  <PropertyGroup>
    275324    <PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">set Path=%25Path%25;$(ProjectDir);$(SolutionDir)
    276325set ProjectDir=$(ProjectDir)
  • branches/HeuristicLab.Problems.Orienteering/HeuristicLab.DataPreprocessing.Views/3.4/HistogramView.Designer.cs

    r11043 r12694  
    2525    private void InitializeComponent() {
    2626      this.optionsBox = new System.Windows.Forms.GroupBox();
     27      this.displayDetailsCheckBox = new System.Windows.Forms.CheckBox();
    2728      this.label1 = new System.Windows.Forms.Label();
    2829      this.classifierComboBox = new System.Windows.Forms.ComboBox();
     
    3334      //
    3435      this.optionsBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
     36      this.optionsBox.Controls.Add(this.displayDetailsCheckBox);
    3537      this.optionsBox.Controls.Add(this.label1);
    3638      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);
    3841      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);
    4044      this.optionsBox.TabIndex = 7;
    4145      this.optionsBox.TabStop = false;
    4246      this.optionsBox.Text = "Options";
    4347      //
     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      //
    4460      // label1
    4561      //
    4662      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);
    4865      this.label1.Name = "label1";
    49       this.label1.Size = new System.Drawing.Size(91, 13);
     66      this.label1.Size = new System.Drawing.Size(108, 17);
    5067      this.label1.TabIndex = 2;
    51       this.label1.Text = "Classifier variable:";
     68      this.label1.Text = "Target variable:";
    5269      //
    5370      // classifierComboBox
     
    5572      this.classifierComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
    5673      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);
    5876      this.classifierComboBox.Name = "classifierComboBox";
    59       this.classifierComboBox.Size = new System.Drawing.Size(121, 21);
     77      this.classifierComboBox.Size = new System.Drawing.Size(160, 24);
    6078      this.classifierComboBox.TabIndex = 1;
    6179      this.classifierComboBox.SelectedIndexChanged += new System.EventHandler(this.classifierComboBox_SelectedIndexChanged);
     
    6381      // HistogramView
    6482      //
    65       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
     83      this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
    6684      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
    6785      this.Controls.Add(this.optionsBox);
     86      this.Margin = new System.Windows.Forms.Padding(5);
    6887      this.Name = "HistogramView";
    6988      this.Controls.SetChildIndex(this.optionsBox, 0);
     
    7998    private System.Windows.Forms.ComboBox classifierComboBox;
    8099    private System.Windows.Forms.Label label1;
     100    private System.Windows.Forms.CheckBox displayDetailsCheckBox;
    81101
    82102  }
  • branches/HeuristicLab.Problems.Orienteering/HeuristicLab.DataPreprocessing.Views/3.4/HistogramView.cs

    r11098 r12694  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    7070
    7171      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      }
    7485    }
    7586  }
  • branches/HeuristicLab.Problems.Orienteering/HeuristicLab.DataPreprocessing.Views/3.4/LineChartView.cs

    r11185 r12694  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/HeuristicLab.Problems.Orienteering/HeuristicLab.DataPreprocessing.Views/3.4/ManipulationView.Designer.cs

    r10977 r12694  
    4949      this.label10 = new System.Windows.Forms.Label();
    5050      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();
    5253      this.grpBoxPreview = new System.Windows.Forms.GroupBox();
    5354      this.tabsPreview = new System.Windows.Forms.TabControl();
     
    6667      this.lblPreviewShuffle = new System.Windows.Forms.Label();
    6768      this.label9 = new System.Windows.Forms.Label();
     69      this.panel1 = new System.Windows.Forms.Panel();
     70      this.panel2 = new System.Windows.Forms.Panel();
    6871      this.grpBoxData.SuspendLayout();
    6972      this.tabsData.SuspendLayout();
     
    8285      this.tabPreviewReplaceMissingValues.SuspendLayout();
    8386      this.tabPreviewShuffle.SuspendLayout();
     87      this.panel1.SuspendLayout();
     88      this.panel2.SuspendLayout();
    8489      this.SuspendLayout();
    8590      //
     
    8994            | System.Windows.Forms.AnchorStyles.Right)));
    9095      this.lstMethods.FormattingEnabled = true;
     96      this.lstMethods.ItemHeight = 16;
    9197      this.lstMethods.Items.AddRange(new object[] {
    9298            "Delete Columns with insufficient Information",
     
    95101            "Replace Missing Values",
    96102            "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);
    98105      this.lstMethods.Name = "lstMethods";
    99       this.lstMethods.Size = new System.Drawing.Size(733, 95);
     106      this.lstMethods.Size = new System.Drawing.Size(976, 116);
    100107      this.lstMethods.Sorted = true;
    101108      this.lstMethods.TabIndex = 0;
     
    106113      this.btnApply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
    107114      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);
    109117      this.btnApply.Name = "btnApply";
    110       this.btnApply.Size = new System.Drawing.Size(129, 23);
     118      this.btnApply.Size = new System.Drawing.Size(172, 28);
    111119      this.btnApply.TabIndex = 2;
    112120      this.btnApply.Text = "Apply Manipulation";
     
    119127            | System.Windows.Forms.AnchorStyles.Right)));
    120128      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);
    122131      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);
    124134      this.grpBoxData.TabIndex = 3;
    125135      this.grpBoxData.TabStop = false;
     
    137147      this.tabsData.Controls.Add(this.tabDataShuffle);
    138148      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);
    140151      this.tabsData.Name = "tabsData";
    141152      this.tabsData.SelectedIndex = 0;
    142       this.tabsData.Size = new System.Drawing.Size(719, 164);
     153      this.tabsData.Size = new System.Drawing.Size(959, 202);
    143154      this.tabsData.TabIndex = 3;
    144155      //
     
    147158      this.tabPage1.Controls.Add(this.label7);
    148159      this.tabPage1.Location = new System.Drawing.Point(4, 22);
     160      this.tabPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
    149161      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);
    152164      this.tabPage1.TabIndex = 5;
    153165      this.tabPage1.Text = "tabDataInactive";
     
    158170      this.label7.AutoSize = true;
    159171      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);
    161174      this.label7.Name = "label7";
    162       this.label7.Size = new System.Drawing.Size(259, 13);
     175      this.label7.Size = new System.Drawing.Size(345, 17);
    163176      this.label7.TabIndex = 1;
    164177      this.label7.Text = "Please select one of the manipulation methods above";
     
    170183      this.tabDataDeleteColumnsInformation.Controls.Add(this.label1);
    171184      this.tabDataDeleteColumnsInformation.Location = new System.Drawing.Point(4, 22);
     185      this.tabDataDeleteColumnsInformation.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
    172186      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);
    175189      this.tabDataDeleteColumnsInformation.TabIndex = 0;
    176190      this.tabDataDeleteColumnsInformation.Text = "del columns info";
     
    180194      //
    181195      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);
    183198      this.label2.Name = "label2";
    184       this.label2.Size = new System.Drawing.Size(89, 13);
     199      this.label2.Size = new System.Drawing.Size(120, 17);
    185200      this.label2.TabIndex = 5;
    186201      this.label2.Text = "% missing values.";
     
    188203      // txtDeleteColumnsInfo
    189204      //
    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);
    191207      this.txtDeleteColumnsInfo.Name = "txtDeleteColumnsInfo";
    192       this.txtDeleteColumnsInfo.Size = new System.Drawing.Size(34, 20);
     208      this.txtDeleteColumnsInfo.Size = new System.Drawing.Size(44, 22);
    193209      this.txtDeleteColumnsInfo.TabIndex = 4;
    194210      this.txtDeleteColumnsInfo.TextChanged += new System.EventHandler(this.txtDeleteColumnsInfo_TextChanged);
     
    197213      //
    198214      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);
    200217      this.label1.Name = "label1";
    201       this.label1.Size = new System.Drawing.Size(155, 13);
     218      this.label1.Size = new System.Drawing.Size(205, 17);
    202219      this.label1.TabIndex = 3;
    203220      this.label1.Text = "Delete columns with more than ";
     
    208225      this.tabDataDeleteColumnsVariance.Controls.Add(this.label4);
    209226      this.tabDataDeleteColumnsVariance.Location = new System.Drawing.Point(4, 22);
     227      this.tabDataDeleteColumnsVariance.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
    210228      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);
    213231      this.tabDataDeleteColumnsVariance.TabIndex = 1;
    214232      this.tabDataDeleteColumnsVariance.Text = "del columns variance";
     
    217235      // txtDeleteColumnsVariance
    218236      //
    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);
    220239      this.txtDeleteColumnsVariance.Name = "txtDeleteColumnsVariance";
    221       this.txtDeleteColumnsVariance.Size = new System.Drawing.Size(135, 20);
     240      this.txtDeleteColumnsVariance.Size = new System.Drawing.Size(179, 22);
    222241      this.txtDeleteColumnsVariance.TabIndex = 4;
    223242      this.txtDeleteColumnsVariance.TextChanged += new System.EventHandler(this.txtDeleteColumnsVariance_TextChanged);
     
    226245      //
    227246      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);
    229249      this.label4.Name = "label4";
    230       this.label4.Size = new System.Drawing.Size(220, 13);
     250      this.label4.Size = new System.Drawing.Size(292, 17);
    231251      this.label4.TabIndex = 3;
    232252      this.label4.Text = "Delete columns with a variance smaller than  ";
     
    238258      this.tabDataDeleteRowsInfo.Controls.Add(this.label5);
    239259      this.tabDataDeleteRowsInfo.Location = new System.Drawing.Point(4, 22);
     260      this.tabDataDeleteRowsInfo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
    240261      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);
    243264      this.tabDataDeleteRowsInfo.TabIndex = 2;
    244265      this.tabDataDeleteRowsInfo.Text = "del rows info";
     
    248269      //
    249270      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);
    251273      this.label3.Name = "label3";
    252       this.label3.Size = new System.Drawing.Size(89, 13);
     274      this.label3.Size = new System.Drawing.Size(120, 17);
    253275      this.label3.TabIndex = 8;
    254276      this.label3.Text = "% missing values.";
     
    256278      // txtDeleteRowsInfo
    257279      //
    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);
    259282      this.txtDeleteRowsInfo.Name = "txtDeleteRowsInfo";
    260       this.txtDeleteRowsInfo.Size = new System.Drawing.Size(34, 20);
     283      this.txtDeleteRowsInfo.Size = new System.Drawing.Size(44, 22);
    261284      this.txtDeleteRowsInfo.TabIndex = 7;
    262285      this.txtDeleteRowsInfo.TextChanged += new System.EventHandler(this.txtDeleteRowsInfo_TextChanged);
     
    265288      //
    266289      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);
    268292      this.label5.Name = "label5";
    269       this.label5.Size = new System.Drawing.Size(138, 13);
     293      this.label5.Size = new System.Drawing.Size(182, 17);
    270294      this.label5.TabIndex = 6;
    271295      this.label5.Text = "Delete rows with more than ";
     
    280304      this.tabReplaceMissingValues.Controls.Add(this.label10);
    281305      this.tabReplaceMissingValues.Location = new System.Drawing.Point(4, 22);
     306      this.tabReplaceMissingValues.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
    282307      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);
    285310      this.tabReplaceMissingValues.TabIndex = 6;
    286311      this.tabReplaceMissingValues.Text = "repl missing vals";
     
    289314      // txtReplaceValue
    290315      //
    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);
    292318      this.txtReplaceValue.Name = "txtReplaceValue";
    293       this.txtReplaceValue.Size = new System.Drawing.Size(100, 20);
     319      this.txtReplaceValue.Size = new System.Drawing.Size(132, 22);
    294320      this.txtReplaceValue.TabIndex = 2;
    295321      this.txtReplaceValue.TextChanged += new System.EventHandler(this.txtReplaceValue_TextChanged);
     
    299325      this.cmbVariableNames.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
    300326      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);
    302329      this.cmbVariableNames.Name = "cmbVariableNames";
    303       this.cmbVariableNames.Size = new System.Drawing.Size(121, 21);
     330      this.cmbVariableNames.Size = new System.Drawing.Size(160, 24);
    304331      this.cmbVariableNames.TabIndex = 1;
    305332      this.cmbVariableNames.SelectedIndexChanged += new System.EventHandler(this.cmbReplaceWith_SelectedIndexChanged);
     
    315342            "Most Common",
    316343            "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);
    318346      this.cmbReplaceWith.Name = "cmbReplaceWith";
    319       this.cmbReplaceWith.Size = new System.Drawing.Size(121, 21);
     347      this.cmbReplaceWith.Size = new System.Drawing.Size(160, 24);
    320348      this.cmbReplaceWith.TabIndex = 1;
    321349      this.cmbReplaceWith.SelectedIndexChanged += new System.EventHandler(this.cmbReplaceWith_SelectedIndexChanged);
     
    324352      //
    325353      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);
    327356      this.lblValueColon.Name = "lblValueColon";
    328       this.lblValueColon.Size = new System.Drawing.Size(10, 13);
     357      this.lblValueColon.Size = new System.Drawing.Size(12, 17);
    329358      this.lblValueColon.TabIndex = 0;
    330359      this.lblValueColon.Text = ":";
     
    333362      //
    334363      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);
    336366      this.label8.Name = "label8";
    337       this.label8.Size = new System.Drawing.Size(26, 13);
     367      this.label8.Size = new System.Drawing.Size(32, 17);
    338368      this.label8.TabIndex = 0;
    339369      this.label8.Text = "with";
     
    342372      //
    343373      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);
    345376      this.label10.Name = "label10";
    346       this.label10.Size = new System.Drawing.Size(133, 13);
     377      this.label10.Size = new System.Drawing.Size(177, 17);
    347378      this.label10.TabIndex = 0;
    348379      this.label10.Text = "Replace missing values for";
     
    350381      // tabDataShuffle
    351382      //
    352       this.tabDataShuffle.Controls.Add(this.label6);
     383      this.tabDataShuffle.Controls.Add(this.shuffleSeparatelyCheckbox);
     384      this.tabDataShuffle.Controls.Add(this.lblShuffleProperties);
    353385      this.tabDataShuffle.Location = new System.Drawing.Point(4, 22);
     386      this.tabDataShuffle.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
    354387      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);
    357390      this.tabDataShuffle.TabIndex = 4;
    358391      this.tabDataShuffle.Text = "shuffle";
    359392      this.tabDataShuffle.UseVisualStyleBackColor = true;
    360393      //
    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";
    370415      //
    371416      // grpBoxPreview
     
    375420            | System.Windows.Forms.AnchorStyles.Right)));
    376421      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);
    378424      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);
    380427      this.grpBoxPreview.TabIndex = 4;
    381428      this.grpBoxPreview.TabStop = false;
     
    393440      this.tabsPreview.Controls.Add(this.tabPreviewShuffle);
    394441      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);
    396444      this.tabsPreview.Name = "tabsPreview";
    397445      this.tabsPreview.SelectedIndex = 0;
    398       this.tabsPreview.Size = new System.Drawing.Size(719, 168);
     446      this.tabsPreview.Size = new System.Drawing.Size(959, 207);
    399447      this.tabsPreview.TabIndex = 3;
    400448      //
     
    403451      this.tabPreviewInactive.Controls.Add(this.lblPreviewInActive);
    404452      this.tabPreviewInactive.Location = new System.Drawing.Point(4, 22);
     453      this.tabPreviewInactive.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
    405454      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);
    408457      this.tabPreviewInactive.TabIndex = 5;
    409458      this.tabPreviewInactive.Text = "inactive";
     
    413462      //
    414463      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);
    416466      this.lblPreviewInActive.Name = "lblPreviewInActive";
    417       this.lblPreviewInActive.Size = new System.Drawing.Size(361, 39);
     467      this.lblPreviewInActive.Size = new System.Drawing.Size(491, 51);
    418468      this.lblPreviewInActive.TabIndex = 2;
    419469      this.lblPreviewInActive.Text = "Filters are active and thus manipulations cannot be applied!\r\n\r\nPlease deactive t" +
     
    423473      // tabPreviewDeleteColumnsInfo
    424474      //
    425       this.tabPreviewDeleteColumnsInfo.Controls.Add(this.lblPreviewColumnsInfo);
     475      this.tabPreviewDeleteColumnsInfo.Controls.Add(this.panel1);
    426476      this.tabPreviewDeleteColumnsInfo.Location = new System.Drawing.Point(4, 22);
     477      this.tabPreviewDeleteColumnsInfo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
    427478      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);
    430481      this.tabPreviewDeleteColumnsInfo.TabIndex = 0;
    431482      this.tabPreviewDeleteColumnsInfo.Text = "del columns info";
     
    435486      //
    436487      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);
    438491      this.lblPreviewColumnsInfo.Name = "lblPreviewColumnsInfo";
    439       this.lblPreviewColumnsInfo.Size = new System.Drawing.Size(318, 13);
     492      this.lblPreviewColumnsInfo.Size = new System.Drawing.Size(423, 17);
    440493      this.lblPreviewColumnsInfo.TabIndex = 1;
    441494      this.lblPreviewColumnsInfo.Text = "{0} columns with more than {1} % missing values would be deleted";
     
    443496      // tabPreviewDeleteColumnsVariance
    444497      //
     498      this.tabPreviewDeleteColumnsVariance.Controls.Add(this.panel2);
    445499      this.tabPreviewDeleteColumnsVariance.Controls.Add(this.label12);
    446       this.tabPreviewDeleteColumnsVariance.Controls.Add(this.lblPreviewColumnsVariance);
    447500      this.tabPreviewDeleteColumnsVariance.Location = new System.Drawing.Point(4, 22);
     501      this.tabPreviewDeleteColumnsVariance.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
    448502      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);
    451505      this.tabPreviewDeleteColumnsVariance.TabIndex = 1;
    452506      this.tabPreviewDeleteColumnsVariance.Text = "del columns variance";
     
    456510      //
    457511      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);
    459514      this.label12.Name = "label12";
    460       this.label12.Size = new System.Drawing.Size(0, 13);
     515      this.label12.Size = new System.Drawing.Size(0, 17);
    461516      this.label12.TabIndex = 2;
    462517      //
     
    464519      //
    465520      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);
    467524      this.lblPreviewColumnsVariance.Name = "lblPreviewColumnsVariance";
    468       this.lblPreviewColumnsVariance.Size = new System.Drawing.Size(301, 13);
     525      this.lblPreviewColumnsVariance.Size = new System.Drawing.Size(398, 17);
    469526      this.lblPreviewColumnsVariance.TabIndex = 2;
    470527      this.lblPreviewColumnsVariance.Text = "{0} columns with a variance smaller than {1} would be deleted.";
     
    474531      this.tabPreviewDeleteRowsInfo.Controls.Add(this.lblPreviewRowsInfo);
    475532      this.tabPreviewDeleteRowsInfo.Location = new System.Drawing.Point(4, 22);
     533      this.tabPreviewDeleteRowsInfo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
    476534      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);
    479537      this.tabPreviewDeleteRowsInfo.TabIndex = 2;
    480538      this.tabPreviewDeleteRowsInfo.Text = "del rows info";
     
    484542      //
    485543      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);
    487546      this.lblPreviewRowsInfo.Name = "lblPreviewRowsInfo";
    488       this.lblPreviewRowsInfo.Size = new System.Drawing.Size(301, 13);
     547      this.lblPreviewRowsInfo.Size = new System.Drawing.Size(400, 17);
    489548      this.lblPreviewRowsInfo.TabIndex = 2;
    490549      this.lblPreviewRowsInfo.Text = "{0} rows with more than {1} % missing values would be deleted";
     
    494553      this.tabPreviewReplaceMissingValues.Controls.Add(this.lblPreviewReplaceMissingValues);
    495554      this.tabPreviewReplaceMissingValues.Location = new System.Drawing.Point(4, 22);
     555      this.tabPreviewReplaceMissingValues.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
    496556      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);
    499559      this.tabPreviewReplaceMissingValues.TabIndex = 6;
    500560      this.tabPreviewReplaceMissingValues.Text = "repl missing vals";
     
    504564      //
    505565      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);
    507568      this.lblPreviewReplaceMissingValues.Name = "lblPreviewReplaceMissingValues";
    508       this.lblPreviewReplaceMissingValues.Size = new System.Drawing.Size(343, 13);
     569      this.lblPreviewReplaceMissingValues.Size = new System.Drawing.Size(449, 17);
    509570      this.lblPreviewReplaceMissingValues.TabIndex = 3;
    510571      this.lblPreviewReplaceMissingValues.Text = "{0} cells detected with missing values which would be replaced with {1}";
     
    514575      this.tabPreviewShuffle.Controls.Add(this.lblPreviewShuffle);
    515576      this.tabPreviewShuffle.Location = new System.Drawing.Point(4, 22);
     577      this.tabPreviewShuffle.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
    516578      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);
    519581      this.tabPreviewShuffle.TabIndex = 4;
    520582      this.tabPreviewShuffle.Text = "shuffle";
     
    524586      //
    525587      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);
    527590      this.lblPreviewShuffle.Name = "lblPreviewShuffle";
    528       this.lblPreviewShuffle.Size = new System.Drawing.Size(252, 13);
     591      this.lblPreviewShuffle.Size = new System.Drawing.Size(337, 17);
    529592      this.lblPreviewShuffle.TabIndex = 0;
    530593      this.lblPreviewShuffle.Text = "Data will be shuffled randomly - preview not possible";
     
    537600      this.label9.TabIndex = 0;
    538601      //
     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      //
    539622      // ManipulationView
    540623      //
    541       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
     624      this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
    542625      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
    543626      this.Controls.Add(this.btnApply);
     
    545628      this.Controls.Add(this.grpBoxData);
    546629      this.Controls.Add(this.lstMethods);
     630      this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
    547631      this.Name = "ManipulationView";
    548       this.Size = new System.Drawing.Size(739, 529);
     632      this.Size = new System.Drawing.Size(985, 651);
    549633      this.grpBoxData.ResumeLayout(false);
    550634      this.tabsData.ResumeLayout(false);
     
    566650      this.tabPreviewInactive.PerformLayout();
    567651      this.tabPreviewDeleteColumnsInfo.ResumeLayout(false);
    568       this.tabPreviewDeleteColumnsInfo.PerformLayout();
    569652      this.tabPreviewDeleteColumnsVariance.ResumeLayout(false);
    570653      this.tabPreviewDeleteColumnsVariance.PerformLayout();
     
    575658      this.tabPreviewShuffle.ResumeLayout(false);
    576659      this.tabPreviewShuffle.PerformLayout();
     660      this.panel1.ResumeLayout(false);
     661      this.panel1.PerformLayout();
     662      this.panel2.ResumeLayout(false);
     663      this.panel2.PerformLayout();
    577664      this.ResumeLayout(false);
    578665
     
    619706    private System.Windows.Forms.Label label10;
    620707    private System.Windows.Forms.TabPage tabDataShuffle;
    621     private System.Windows.Forms.Label label6;
     708    private System.Windows.Forms.Label lblShuffleProperties;
    622709    private System.Windows.Forms.ComboBox cmbVariableNames;
    623710    private System.Windows.Forms.Label label8;
    624711    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;
    625715  }
    626716}
  • branches/HeuristicLab.Problems.Orienteering/HeuristicLab.DataPreprocessing.Views/3.4/ManipulationView.cs

    r11185 r12694  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2323using System.Collections.Generic;
    2424using System.Drawing;
     25using System.Globalization;
     26using System.Linq;
     27using System.Text;
    2528using System.Windows.Forms;
    2629using HeuristicLab.Core.Views;
     
    5154        ()=>validateDeleteRowsInfo(),
    5255        ()=>validateReplaceWith(),
    53         ()=>{btnApply.Enabled = true; lblPreviewShuffle.Text = "Data will be shuffled randomly - preview not possible";} //shuffle
     56        ()=>validateShuffle()
    5457      };
    5558
     
    5962        ()=>Content.ManipulationLogic.DeleteRowsWithMissingValuesGreater(getRowsColumnsInfo()),
    6063        ()=>replaceMissingValues(),
    61         ()=>Content.ManipulationLogic.ShuffleWithRanges()
     64        ()=>Content.ManipulationLogic.Shuffle(shuffleSeparatelyCheckbox.Checked)
    6265      };
    63 
    6466    }
    6567
     
    150152      validateDoubleTextBox(txtDeleteColumnsInfo.Text);
    151153      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.";
    155158        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();
    157172        } else {
    158173          btnApply.Enabled = false;
     
    166181      validateDoubleTextBox(txtDeleteColumnsVariance.Text);
    167182      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 + ".";
    171187        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();
    173201        } else {
    174202          btnApply.Enabled = false;
     
    228256    }
    229257
     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
    230266    public new ManipulationContent Content {
    231267      get { return (ManipulationContent)base.Content; }
     
    272308      if (!string.IsNullOrEmpty(text)) {
    273309        double percent;
    274         if (Double.TryParse(text, out percent)) {
     310        if (Double.TryParse(text, NumberStyles.Number ^ NumberStyles.AllowThousands, CultureInfo.CurrentCulture, out percent)) {
    275311          btnApply.Enabled = true;
    276312        }
  • branches/HeuristicLab.Problems.Orienteering/HeuristicLab.DataPreprocessing.Views/3.4/Plugin.cs.frame

    r11185 r12694  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2626  /// Plugin class for HeuristicLab.Data plugin.
    2727  /// </summary>
    28   [Plugin("HeuristicLab.DataPreprocessing.Views", "3.4.0.$WCREV$")]
     28  [Plugin("HeuristicLab.DataPreprocessing.Views", "3.4.1.$WCREV$")]
    2929  [PluginFile("HeuristicLab.DataPreprocessing.Views-3.4.dll", PluginFileType.Assembly)]
    3030  [PluginDependency("HeuristicLab.Analysis", "3.3")]
  • branches/HeuristicLab.Problems.Orienteering/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingChartView.Designer.cs

    r11185 r12694  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/HeuristicLab.Problems.Orienteering/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingChartView.cs

    r11185 r12694  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    2222using System;
    2323using System.Collections.Generic;
     24using System.Linq;
    2425using System.Windows.Forms;
    2526using HeuristicLab.Analysis;
     
    4950
    5051    public IEnumerable<double> Classification { get; set; }
     52    public bool IsDetailedChartViewEnabled { get; set; }
    5153
    5254    public PreprocessingChartView() {
     
    5961    //Add or remove data row
    6062    private void CheckedItemsChanged(object sender, CollectionItemsChangedEventArgs<IndexedItem<StringValue>> checkedItems) {
     63
    6164      foreach (IndexedItem<StringValue> item in checkedItems.Items) {
    6265        string variableName = item.Value.Value;
     
    121124      if (Content.VariableItemList == null) {
    122125        Content.VariableItemList = Content.CreateVariableItemList();
     126      } else {
     127        var checkedNames = Content.VariableItemList.CheckedItems.Select(x => x.Value.Value);
     128        Content.VariableItemList = Content.CreateVariableItemList(checkedNames);
    123129      }
    124130      checkedItemList.Content = Content.VariableItemList;
     
    135141        DataRow row = GetDataRow(variableName);
    136142
    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        }
    143151      }
    144152
     
    152160      dataTable.SelectedRows.Clear();
    153161      foreach (var selectedRow in selectedDataRows) {
    154         if(VariableIsDisplayed(selectedRow.Name))
     162        if (VariableIsDisplayed(selectedRow.Name))
    155163          dataTable.SelectedRows.Add(selectedRow);
    156164      }
     
    354362      PreprocessingDataTableView dataView = new PreprocessingDataTableView();
    355363      dataView.Classification = Classification;
     364      dataView.IsDetailedChartViewEnabled = IsDetailedChartViewEnabled;
    356365
    357366      if (dataTable == null) {
  • branches/HeuristicLab.Problems.Orienteering/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingCheckedItemListView.Designer.cs

    r11185 r12694  
    22
    33/* HeuristicLab
    4  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    55 *
    66 * This file is part of HeuristicLab.
  • branches/HeuristicLab.Problems.Orienteering/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingCheckedItemListView.cs

    r11185 r12694  
    22
    33/* HeuristicLab
    4  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    55 *
    66 * This file is part of HeuristicLab.
  • branches/HeuristicLab.Problems.Orienteering/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingDataTableView.Designer.cs

    r11185 r12694  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/HeuristicLab.Problems.Orienteering/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingDataTableView.cs

    r11185 r12694  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    4747
    4848    public IEnumerable<double> Classification { get; set; }
     49    public bool IsDetailedChartViewEnabled { get; set; }
    4950
    5051    public PreprocessingDataTableView() {
     
    145146        RegisterDataRowEvents(row);
    146147        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;
    148150        else series.LegendText = row.Name;
     151
    149152        ConfigureSeries(series, row);
    150153        FillSeriesWithRowValues(series, row);
    151154
     155        if (IsDetailedChartViewEnabled) {
     156          series.LegendText += " Values: " + row.Values.Count;
     157        }
    152158        if (Classification == null)
    153159          chart.Series.Add(series);
     
    661667
    662668        chart.Titles.Add(row.Name);
    663 
     669        int featureOverallValueCount = 0;
     670        if (IsDetailedChartViewEnabled)
     671          featureOverallValueCount = row.Values.Count(x => !IsInvalidValue(x));
    664672        foreach (KeyValuePair<double, List<double>> entry in valuesPerClass) {
    665673          var s = new Series(row.Name + entry.Key);
     
    669677
    670678          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          }
    672686          chart.Series.Add(s);
    673687        }
     
    752766                              ? "Y"
    753767                              : 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);
    759776      }
    760777    }
  • branches/HeuristicLab.Problems.Orienteering/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingFeatureCorrelationView.Designer.cs

    r11185 r12694  
    22
    33/* HeuristicLab
    4  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    55 *
    66 * This file is part of HeuristicLab.
  • branches/HeuristicLab.Problems.Orienteering/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingFeatureCorrelationView.cs

    r11185 r12694  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/HeuristicLab.Problems.Orienteering/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingScatterPlotView.Designer.cs

    r11185 r12694  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/HeuristicLab.Problems.Orienteering/HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingScatterPlotView.cs

    r11185 r12694  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * 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
     22using System.Reflection;
    223using System.Runtime.CompilerServices;
    324using System.Runtime.InteropServices;
     
    930[assembly: AssemblyDescription("")]
    1031[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")]
    1435[assembly: AssemblyTrademark("")]
    1536[assembly: AssemblyCulture("")]
     
    3455// [assembly: AssemblyVersion("1.0.*")]
    3556[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  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/HeuristicLab.Problems.Orienteering/HeuristicLab.DataPreprocessing.Views/3.4/StatisticsView.cs

    r11185 r12694  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
     
    166166        "", //standard deviation
    167167        "", //variance
    168         logic.GetMostCommonValue<string>(columnIndex).ToString(),
     168        logic.GetMostCommonValue<string>(columnIndex) ?? "",
    169169        logic.GetDifferentValuesCount<string>(columnIndex).ToString()
    170170      };
  • branches/HeuristicLab.Problems.Orienteering/HeuristicLab.DataPreprocessing.Views/3.4/TransformationView.Designer.cs

    r11185 r12694  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/HeuristicLab.Problems.Orienteering/HeuristicLab.DataPreprocessing.Views/3.4/TransformationView.cs

    r11185 r12694  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/HeuristicLab.Problems.Orienteering/HeuristicLab.DataPreprocessing.Views/3.4/Utils/FindPreprocessingItemsIterator.cs

    r11185 r12694  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/HeuristicLab.Problems.Orienteering/HeuristicLab.DataPreprocessing.Views/3.4/Utils/IFindPreprocessingItemsIterator.cs

    r11185 r12694  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/HeuristicLab.Problems.Orienteering/HeuristicLab.DataPreprocessing.Views/3.4/ViewShortcutListView.Designer.cs

    r11185 r12694  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
  • branches/HeuristicLab.Problems.Orienteering/HeuristicLab.DataPreprocessing.Views/3.4/ViewShortcutListView.cs

    r11185 r12694  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2014 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
Note: See TracChangeset for help on using the changeset viewer.