Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
06/24/13 20:22:11 (11 years ago)
Author:
ascheibe
Message:

#2030 merged trunk into hive performance branch

Location:
branches/HivePerformance/sources
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/HivePerformance/sources

  • branches/HivePerformance/sources/HeuristicLab.Problems.Instances.DataAnalysis.Views

  • branches/HivePerformance/sources/HeuristicLab.Problems.Instances.DataAnalysis.Views/3.3/DataAnalysisImportTypeDialog.Designer.cs

    r9616 r9655  
    103103      // TrainingTestTrackBar
    104104      //
    105       this.TrainingTestTrackBar.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
     105      this.TrainingTestTrackBar.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    106106            | System.Windows.Forms.AnchorStyles.Right)));
    107107      this.TrainingTestTrackBar.Location = new System.Drawing.Point(6, 43);
     
    167167      // ProblemTextBox
    168168      //
    169       this.ProblemTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
     169      this.ProblemTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    170170            | System.Windows.Forms.AnchorStyles.Right)));
    171171      this.ProblemTextBox.Location = new System.Drawing.Point(91, 6);
     
    181181      // DateTimeFormatComboBox
    182182      //
    183       this.DateTimeFormatComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
     183      this.DateTimeFormatComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    184184            | System.Windows.Forms.AnchorStyles.Right)));
    185185      this.DateTimeFormatComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
     
    194194      // DecimalSeparatorComboBox
    195195      //
    196       this.DecimalSeparatorComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
     196      this.DecimalSeparatorComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    197197            | System.Windows.Forms.AnchorStyles.Right)));
    198198      this.DecimalSeparatorComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
     
    234234      // SeparatorComboBox
    235235      //
    236       this.SeparatorComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
     236      this.SeparatorComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    237237            | System.Windows.Forms.AnchorStyles.Right)));
    238238      this.SeparatorComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
     
    247247      // CSVSettingsGroupBox
    248248      //
    249       this.CSVSettingsGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
     249      this.CSVSettingsGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    250250            | System.Windows.Forms.AnchorStyles.Right)));
    251251      this.CSVSettingsGroupBox.Controls.Add(this.CheckboxColumnNames);
     
    304304      // ProblemDataSettingsGroupBox
    305305      //
    306       this.ProblemDataSettingsGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
    307             | System.Windows.Forms.AnchorStyles.Left) 
     306      this.ProblemDataSettingsGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     307            | System.Windows.Forms.AnchorStyles.Left)
    308308            | System.Windows.Forms.AnchorStyles.Right)));
    309309      this.ProblemDataSettingsGroupBox.Controls.Add(this.ErrorTextBox);
     
    324324      // ErrorTextBox
    325325      //
     326      this.ErrorTextBox.Anchor = System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right;
    326327      this.ErrorTextBox.Location = new System.Drawing.Point(6, 15);
    327328      this.ErrorTextBox.Multiline = true;
     
    354355      // PreviewDatasetMatrix
    355356      //
    356       this.PreviewDatasetMatrix.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
    357             | System.Windows.Forms.AnchorStyles.Left) 
     357      this.PreviewDatasetMatrix.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
     358            | System.Windows.Forms.AnchorStyles.Left)
    358359            | System.Windows.Forms.AnchorStyles.Right)));
    359360      this.PreviewDatasetMatrix.Caption = "Dataset Preview";
  • branches/HivePerformance/sources/HeuristicLab.Problems.Instances.DataAnalysis.Views/3.3/DataAnalysisImportTypeDialog.cs

    r9616 r9655  
    4242      new KeyValuePair<char, string>(';', "; (Semicolon)" ),
    4343      new KeyValuePair<char, string>(',', ", (Comma)" ),   
    44       new KeyValuePair<char, string>('\t', "\\t (Tab)")
     44      new KeyValuePair<char, string>('\t', "\\t (Tab)"),
     45      new KeyValuePair<char, string>((char)0, "all whitespaces (including tabs and spaces)")
    4546    };
    4647
Note: See TracChangeset for help on using the changeset viewer.