Changeset 2436 for trunk/sources

Timestamp:

10/15/09 14:47:01 (15 years ago)

Author:

gkronber

Message:

Fixed a bug in import of SVM predictors. #772 (Text export of SVM models)

File:

• trunk/sources/HeuristicLab.SupportVectorMachines/3.2/Predictor.cs (modified) (4 diffs)

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

@@ -50 +50 @@
     }
 
-    public Predictor() : base() { } // for persistence
+    // for persistence
+    public Predictor() : base() { }
 
     public Predictor(SVMModel model, string targetVariable, IEnumerable<string> variableNames) :
@@ -57 +58 @@
 
     public Predictor(SVMModel model, string targetVariable, IEnumerable<string> variableNames, int minTimeOffset, int maxTimeOffset)
-      : base() {
+      : this() {
       this.svmModel = model;
       this.targetVariable = targetVariable;
-      this.variableNames = new List<string>(variableNames);
       this.minTimeOffset = minTimeOffset;
       this.maxTimeOffset = maxTimeOffset;
+      this.variableNames = new List<string>(variableNames);
     }
 
@@ -169 +170 @@
 
     public static Predictor Import(TextReader reader) {
-      Predictor p = new Predictor();
       string[] targetVariableLine = reader.ReadLine().Split(':');
       string[] lowerPredictionLimitLine = reader.ReadLine().Split(':');
@@ -177 +177 @@
       string[] inputVariableLine = reader.ReadLine().Split(':', ';');
 
-      p.targetVariable = targetVariableLine[1].Trim();
-      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]);
+      string targetVariable = targetVariableLine[1].Trim();
+      double lowerPredictionLimit = double.Parse(lowerPredictionLimitLine[1], CultureInfo.InvariantCulture.NumberFormat);
+      double upperPredictionLimit = double.Parse(upperPredictionLimitLine[1], CultureInfo.InvariantCulture.NumberFormat);
+      int maxTimeOffset = int.Parse(maxTimeOffsetLine[1]);
+      int minTimeOffset = int.Parse(minTimeOffsetLine[1]);
+      List<string> variableNames = new List<string>();
       foreach (string inputVariable in inputVariableLine.Skip(1)) {
-        p.variableNames.Add(inputVariable.Trim());
+        variableNames.Add(inputVariable.Trim());
       }
-      p.svmModel = SVMModel.Import(reader);
+      SVMModel model = SVMModel.Import(reader);
+      Predictor p = new Predictor(model, targetVariable, variableNames, minTimeOffset, maxTimeOffset);
+      p.UpperPredictionLimit = upperPredictionLimit;
+      p.LowerPredictionLimit = lowerPredictionLimit;
       return p;
     }