Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
06/11/13 21:41:08 (11 years ago)
Author:
sforsten
Message:

#2070:

  • changed parse methods in TableFileParser to accept a bool which defines, if the first line contains variable names
  • added methods in TableFileParser to check if the first line contains variable names
  • adapted unit tests
  • adapted DataAnalysisImportTypeDialog so that a checkbox can be set to define if the first line contains variable names
  • added the flag NumberStyles.AllowTrailingSign for parsing doubles
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis.Views/3.3/DataAnalysisImportTypeDialog.Designer.cs

    r9456 r9608  
    7272      this.PreviewDatasetMatrix = new HeuristicLab.Data.Views.StringConvertibleMatrixView();
    7373      this.ToolTip = new System.Windows.Forms.ToolTip(this.components);
     74      this.CheckboxColumnNames = new System.Windows.Forms.CheckBox();
    7475      ((System.ComponentModel.ISupportInitialize)(this.TrainingTestTrackBar)).BeginInit();
    7576      this.CSVSettingsGroupBox.SuspendLayout();
     
    9394      this.OkButton.DialogResult = System.Windows.Forms.DialogResult.OK;
    9495      this.OkButton.Enabled = false;
    95       this.OkButton.Location = new System.Drawing.Point(303, 407);
     96      this.OkButton.Location = new System.Drawing.Point(303, 422);
    9697      this.OkButton.Name = "OkButton";
    9798      this.OkButton.Size = new System.Drawing.Size(75, 23);
     
    137138      this.CancelationButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
    138139      this.CancelationButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
    139       this.CancelationButton.Location = new System.Drawing.Point(384, 407);
     140      this.CancelationButton.Location = new System.Drawing.Point(384, 422);
    140141      this.CancelationButton.Name = "CancelationButton";
    141142      this.CancelationButton.Size = new System.Drawing.Size(75, 23);
     
    248249      this.CSVSettingsGroupBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    249250            | System.Windows.Forms.AnchorStyles.Right)));
     251      this.CSVSettingsGroupBox.Controls.Add(this.CheckboxColumnNames);
    250252      this.CSVSettingsGroupBox.Controls.Add(this.DateTimeFormatInfoLabel);
    251253      this.CSVSettingsGroupBox.Controls.Add(this.DecimalSeparatorInfoLabel);
     
    259261      this.CSVSettingsGroupBox.Location = new System.Drawing.Point(12, 32);
    260262      this.CSVSettingsGroupBox.Name = "CSVSettingsGroupBox";
    261       this.CSVSettingsGroupBox.Size = new System.Drawing.Size(447, 105);
     263      this.CSVSettingsGroupBox.Size = new System.Drawing.Size(447, 126);
    262264      this.CSVSettingsGroupBox.TabIndex = 16;
    263265      this.CSVSettingsGroupBox.TabStop = false;
     
    313315      this.ProblemDataSettingsGroupBox.Controls.Add(this.TrainingTestTrackBar);
    314316      this.ProblemDataSettingsGroupBox.Controls.Add(this.ShuffleDataCheckbox);
    315       this.ProblemDataSettingsGroupBox.Location = new System.Drawing.Point(12, 143);
     317      this.ProblemDataSettingsGroupBox.Location = new System.Drawing.Point(12, 164);
    316318      this.ProblemDataSettingsGroupBox.Name = "ProblemDataSettingsGroupBox";
    317       this.ProblemDataSettingsGroupBox.Size = new System.Drawing.Size(447, 258);
     319      this.ProblemDataSettingsGroupBox.Size = new System.Drawing.Size(447, 252);
    318320      this.ProblemDataSettingsGroupBox.TabIndex = 17;
    319321      this.ProblemDataSettingsGroupBox.TabStop = false;
     
    362364      this.PreviewDatasetMatrix.ShowRowsAndColumnsTextBox = false;
    363365      this.PreviewDatasetMatrix.ShowStatisticalInformation = false;
    364       this.PreviewDatasetMatrix.Size = new System.Drawing.Size(435, 144);
     366      this.PreviewDatasetMatrix.Size = new System.Drawing.Size(435, 138);
    365367      this.PreviewDatasetMatrix.TabIndex = 0;
     368      //
     369      // CheckboxColumnNames
     370      //
     371      this.CheckboxColumnNames.AutoSize = true;
     372      this.CheckboxColumnNames.Location = new System.Drawing.Point(9, 103);
     373      this.CheckboxColumnNames.Name = "CheckboxColumnNames";
     374      this.CheckboxColumnNames.Size = new System.Drawing.Size(144, 17);
     375      this.CheckboxColumnNames.TabIndex = 24;
     376      this.CheckboxColumnNames.Text = "Column names in first line";
     377      this.CheckboxColumnNames.UseVisualStyleBackColor = true;
     378      this.CheckboxColumnNames.CheckedChanged += new System.EventHandler(this.CheckboxColumnNames_CheckedChanged);
    366379      //
    367380      // DataAnalysisImportTypeDialog
     
    370383      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    371384      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
    372       this.ClientSize = new System.Drawing.Size(471, 442);
     385      this.ClientSize = new System.Drawing.Size(471, 457);
    373386      this.Controls.Add(this.ProblemDataSettingsGroupBox);
    374387      this.Controls.Add(this.CSVSettingsGroupBox);
     
    422435    protected System.Windows.Forms.Label ShuffelInfoLabel;
    423436    protected System.Windows.Forms.ToolTip ToolTip;
     437    private System.Windows.Forms.CheckBox CheckboxColumnNames;
    424438  }
    425439}
Note: See TracChangeset for help on using the changeset viewer.