Changeset 2290 for trunk/sources/HeuristicLab.SupportVectorMachines/3.2/Predictor.cs

Timestamp:

08/14/09 19:56:04 (15 years ago)

Author:

gkronber

Message:

• introduced a variablename to index mapping for SVM models (to make sure we can use the model for prediction in the model analyzer)
• added support to enable and disable algorithms in the dispatcher and removed DispatcherBase
• fixed bugs when calculating variable impacts and reading the final model of GP algorithms

#722 (IModel should provide a Predict() method to get predicted values for an input vector)

File:

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

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

@@ -34 +34 @@
   public class Predictor : ItemBase, IPredictor {
     private SVMModel svmModel;
+    private Dictionary<string, int> variableNames = new Dictionary<string, int>();
     private string targetVariable;
 
     public Predictor() : base() { } // for persistence
 
-    public Predictor(SVMModel model, string targetVariable)
+    public Predictor(SVMModel model, string targetVariable, Dictionary<string, int> variableNames)
       : base() {
       this.svmModel = model;
       this.targetVariable = targetVariable;
+      this.variableNames = variableNames;
     }
 
@@ -49 +51 @@
       RangeTransform transform = svmModel.RangeTransform;
       Model model = svmModel.Model;
+      // maps columns of the current input dataset to the columns that were originally used in training
+      Dictionary<int, int> newIndex = new Dictionary<int, int>();
+      foreach (var pair in variableNames) {
+        newIndex[input.GetVariableIndex(pair.Key)] = pair.Value;
+      }
 
-      Problem p = SVMHelper.CreateSVMProblem(input, input.GetVariableIndex(targetVariable), start, end);
+      Problem p = SVMHelper.CreateSVMProblem(input, input.GetVariableIndex(targetVariable), newIndex, start, end);
       Problem scaledProblem = SVM.Scaling.Scale(p, transform);
 
@@ -70 +77 @@
       clone.svmModel = (SVMModel)Auxiliary.Clone(svmModel, clonedObjects);
       clone.targetVariable = targetVariable;
+      clone.variableNames = new Dictionary<string, int>(variableNames);
       return clone;
     }
@@ -79 +87 @@
       node.Attributes.Append(targetVarAttr);
       node.AppendChild(PersistenceManager.Persist(svmModel, document, persistedObjects));
+      XmlNode variablesNode = document.CreateElement("Variables");
+      foreach (var pair in variableNames) {
+        XmlNode pairNode = document.CreateElement("Variable");
+        XmlAttribute nameAttr = document.CreateAttribute("Name");
+        XmlAttribute indexAttr = document.CreateAttribute("Index");
+        nameAttr.Value = pair.Key;
+        indexAttr.Value = XmlConvert.ToString(pair.Value);
+        pairNode.Attributes.Append(nameAttr);
+        pairNode.Attributes.Append(indexAttr);
+        variablesNode.AppendChild(pairNode);
+      }
+      node.AppendChild(variablesNode);
       return node;
     }
@@ -86 +106 @@
       targetVariable = node.Attributes["TargetVariable"].Value;
       svmModel = (SVMModel)PersistenceManager.Restore(node.ChildNodes[0], restoredObjects);
+
+      variableNames = new Dictionary<string, int>();
+      XmlNode variablesNode = node.ChildNodes[1];
+      foreach (XmlNode pairNode in variablesNode.ChildNodes) {
+        variableNames[pairNode.Attributes["Name"].Value] = XmlConvert.ToInt32(pairNode.Attributes["Index"].Value);
+      }
     }
   }