Changeset 2418 for trunk/sources/HeuristicLab.SupportVectorMachines

Timestamp:

10/07/09 16:19:21 (15 years ago)

Author:

gkronber

Message:

Fixed bugs in text export/import of SVM models. #772.

Location:

trunk/sources/HeuristicLab.SupportVectorMachines/3.2

Files:

• Predictor.cs (modified) (4 diffs)
• SVMModel.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.SupportVectorMachines/3.2/Predictor.cs

@@ -159 +159 @@
       StreamWriter writer = new StreamWriter(s);
       writer.Write("Targetvariable: "); writer.WriteLine(p.targetVariable);
-      writer.Write("LowerPredictionLimit: "); writer.WriteLine(p.LowerPredictionLimit.ToString("r"));
-      writer.Write("UpperPredictionLimit: "); writer.WriteLine(p.UpperPredictionLimit.ToString("r"));
+      writer.Write("LowerPredictionLimit: "); writer.WriteLine(p.LowerPredictionLimit.ToString("r", CultureInfo.InvariantCulture.NumberFormat));
+      writer.Write("UpperPredictionLimit: "); writer.WriteLine(p.UpperPredictionLimit.ToString("r", CultureInfo.InvariantCulture.NumberFormat));
       writer.Write("MaxTimeOffset: "); writer.WriteLine(p.MaxTimeOffset.ToString());
       writer.Write("MinTimeOffset: "); writer.WriteLine(p.MinTimeOffset.ToString());
@@ -176 +176 @@
     }
 
-    public static Predictor Import(Stream s) {
+    public static Predictor Import(TextReader reader) {
       Predictor p = new Predictor();
-      StreamReader reader = new StreamReader(s);
       string[] targetVariableLine = reader.ReadLine().Split(':');
       string[] lowerPredictionLimitLine = reader.ReadLine().Split(':');
@@ -187 +186 @@
 
       p.targetVariable = targetVariableLine[1].Trim();
-      p.LowerPredictionLimit = double.Parse(lowerPredictionLimitLine[1]);
-      p.UpperPredictionLimit = double.Parse(upperPredictionLimitLine[1]);
+      p.LowerPredictionLimit = double.Parse(lowerPredictionLimitLine[1], CultureInfo.InvariantCulture.NumberFormat);
+      p.UpperPredictionLimit = double.Parse(upperPredictionLimitLine[1], CultureInfo.InvariantCulture.NumberFormat);
       p.maxTimeOffset = int.Parse(maxTimeOffsetLine[1]);
       p.minTimeOffset = int.Parse(minTimeOffsetLine[1]);
@@ -195 +194 @@
         p.variableNames[inputVariable.Trim()] = i++;
       }
-      p.svmModel = SVMModel.Import(s);
+      p.svmModel = SVMModel.Import(reader);
       return p;
     }

trunk/sources/HeuristicLab.SupportVectorMachines/3.2/SVMModel.cs

@@ -120 +120 @@
       StreamWriter writer = new StreamWriter(s);
       writer.WriteLine("RangeTransform:");
+      writer.Flush();
       using (MemoryStream memStream = new MemoryStream()) {
         SVM.RangeTransform.Write(memStream, model.RangeTransform);
@@ -126 +127 @@
       }
       writer.WriteLine("Model:");
-
+      writer.Flush();
       using (MemoryStream memStream = new MemoryStream()) {
         SVM.Model.Write(memStream, model.Model);
@@ -135 +136 @@
     }
 
-    public static SVMModel Import(Stream s) {
+    public static SVMModel Import(TextReader reader) {
       SVMModel model = new SVMModel();
-      StreamReader reader = new StreamReader(s);
       while (reader.ReadLine().Trim() != "RangeTransform:") ; // read until line "RangeTransform";
-      model.RangeTransform = SVM.RangeTransform.Read(s);
-
+      model.RangeTransform = SVM.RangeTransform.Read(reader);
       // read until "Model:"
       while (reader.ReadLine().Trim() != "Model:") ;
-      model.Model = SVM.Model.Read(s);
+      model.Model = SVM.Model.Read(reader);
       return model;
     }