Changeset 13974 for stable/HeuristicLab.Problems.Instances.DataAnalysis/3.3/DataAnalysisInstanceProvider.cs

Timestamp:

07/02/16 08:15:07 (8 years ago)

Author:

gkronber

Message:

#2071: merged r13411,r13413,r13414,r13415,r13419,r13440,r13441,r13442,r13445,r13447,r13525,r13526,r13529,r13584,r13901,r13925 from trunk to stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.Instances.DataAnalysis (modified) (1 prop)
• HeuristicLab.Problems.Instances.DataAnalysis/3.3/DataAnalysisInstanceProvider.cs (modified) (3 diffs)

stable/HeuristicLab.Problems.Instances.DataAnalysis/3.3/DataAnalysisInstanceProvider.cs

@@ -23 +23 @@
 using System.Collections;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Globalization;
 using System.IO;
@@ -35 +36 @@
     where ImportType : DataAnalysisImportType {
 
+    public event ProgressChangedEventHandler ProgressChanged;
 
     public TData ImportData(string path, ImportType type, DataAnalysisCSVFormat csvFormat) {
       TableFileParser csvFileParser = new TableFileParser();
+      long fileSize = new FileInfo(path).Length;
+      csvFileParser.ProgressChanged += (sender, e) => {
+        OnProgressChanged(e / (double)fileSize);
+      };
       csvFileParser.Parse(path, csvFormat.NumberFormatInfo, csvFormat.DateTimeFormatInfo, csvFormat.Separator, csvFormat.VariableNamesAvailable);
       return ImportData(path, type, csvFileParser);
+    }
+
+    protected virtual void OnProgressChanged(double d) {
+      var handler = ProgressChanged;
+      if (handler != null)
+        handler(this, new ProgressChangedEventArgs((int)(100 * d), null));
     }
 
@@ -89 +101 @@
         strBuilder.AppendLine();
       }
-
-      using (var writer = new StreamWriter(path)) {
-        writer.Write(strBuilder);
+      using (var fileStream = new FileStream(path, FileMode.Create)) {
+        Encoding encoding = Encoding.GetEncoding(Encoding.Default.CodePage,
+          new EncoderReplacementFallback("*"),
+          new DecoderReplacementFallback("*"));
+        using (var writer = new StreamWriter(fileStream, encoding)) {
+          writer.Write(strBuilder);
+        }
       }
     }