Changeset 7843 for branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.DataAnalysis/3.4/Implementation

Timestamp:

05/16/12 16:58:16 (13 years ago)

Author:

gkronber

Message:

#1081: fixed compile errors after merging changes from the trunk

Location:

branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/TimeSeriesPrognosis

Files:

• TimeSeriesPrognosisProblem.cs (modified) (1 diff)
• TimeSeriesPrognosisProblemData.cs (modified) (3 diffs)

branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/TimeSeriesPrognosis/TimeSeriesPrognosisProblem.cs

@@ -39 +39 @@
     }
 
-    public override void ImportProblemDataFromFile(string fileName) {
-      TimeSeriesPrognosisProblemData problemData = TimeSeriesPrognosisProblemData.ImportFromFile(fileName);
-      ProblemData = problemData;
-    }
   }
 }

branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/TimeSeriesPrognosis/TimeSeriesPrognosisProblemData.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.IO;
 using System.Linq;
@@ -29 +30 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Problems.Instances;
 
 namespace HeuristicLab.Problems.DataAnalysis {
@@ -1618 +1620 @@
     public static TimeSeriesPrognosisProblemData ImportFromFile(string fileName) {
       TableFileParser csvFileParser = new TableFileParser();
-      csvFileParser.Parse(fileName);
+      csvFileParser.Parse(fileName, NumberFormatInfo.InvariantInfo, DateTimeFormatInfo.InvariantInfo, ',');
 
       Dataset dataset = new Dataset(csvFileParser.VariableNames, csvFileParser.Values);