Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
07/10/15 14:16:51 (9 years ago)
Author:
mkommend
Message:

#2335: Merged all changes into stable.

Location:
stable
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • stable

  • stable/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
  • stable/HeuristicLab.DataPreprocessing.Views/3.4/ManipulationView.cs

    r12009 r12718  
    2323using System.Collections.Generic;
    2424using System.Drawing;
     25using System.Globalization;
     26using System.Linq;
     27using System.Text;
    2528using System.Windows.Forms;
    2629using HeuristicLab.Core.Views;
     
    149152      validateDoubleTextBox(txtDeleteColumnsInfo.Text);
    150153      if (btnApply.Enabled) {
    151         int count = Content.ManipulationLogic.ColumnsWithMissingValuesGreater(getDeleteColumnsInfo()).Count;
    152         int rowCount = Content.FilterLogic.PreprocessingData.Rows;
    153         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.";
    154158        if (count > 0) {
    155           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();
    156172        } else {
    157173          btnApply.Enabled = false;
     
    165181      validateDoubleTextBox(txtDeleteColumnsVariance.Text);
    166182      if (btnApply.Enabled) {
    167         int count = Content.ManipulationLogic.ColumnsWithVarianceSmaller(getDeleteColumnsVariance()).Count;
    168         int rowCount = Content.FilterLogic.PreprocessingData.Rows;
    169         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 + ".";
    170187        if (count > 0) {
    171           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();
    172201        } else {
    173202          btnApply.Enabled = false;
     
    279308      if (!string.IsNullOrEmpty(text)) {
    280309        double percent;
    281         if (Double.TryParse(text, out percent)) {
     310        if (Double.TryParse(text, NumberStyles.Number ^ NumberStyles.AllowThousands, CultureInfo.CurrentCulture, out percent)) {
    282311          btnApply.Enabled = true;
    283312        }
Note: See TracChangeset for help on using the changeset viewer.