Changeset 14343 for trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis

Timestamp:

10/20/16 17:28:48 (8 years ago)

Author:

mkommend

Message:

#2688: Forwarded selected encoding from the import dialog to the table file parser.

Location:

trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3

Files:

• DataAnalysisCSVFormat.cs (modified) (2 diffs)
• DataAnalysisInstanceProvider.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/DataAnalysisCSVFormat.cs

@@ -21 +21 @@
 
 using System.Globalization;
+using System.Text;
 
 namespace HeuristicLab.Problems.Instances.DataAnalysis {
@@ -28 +29 @@
     public DateTimeFormatInfo DateTimeFormatInfo { get; set; }
     public bool VariableNamesAvailable { get; set; }
+    public Encoding Encoding { get; set; }
   }
 }

trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis/3.3/DataAnalysisInstanceProvider.cs

@@ -40 +40 @@
     public TData ImportData(string path, ImportType type, DataAnalysisCSVFormat csvFormat) {
       TableFileParser csvFileParser = new TableFileParser();
+      csvFileParser.Encoding = csvFormat.Encoding;
       long fileSize = new FileInfo(path).Length;
       csvFileParser.ProgressChanged += (sender, e) => {