Changeset 2440 for trunk/sources/HeuristicLab.SupportVectorMachines/3.2/SupportVectorCreator.cs

Timestamp:

10/20/09 11:20:13 (15 years ago)

Author:

gkronber

Message:

Fixed #784 (ProblemInjector should be changed to read variable names instead of indexes for input and target variables)

File:

• trunk/sources/HeuristicLab.SupportVectorMachines/3.2/SupportVectorCreator.cs (modified) (3 diffs)

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

@@ -40 +40 @@
       //Dataset infos
       AddVariableInfo(new VariableInfo("Dataset", "Dataset with all samples on which to apply the function", typeof(Dataset), VariableKind.In));
-      AddVariableInfo(new VariableInfo("TargetVariable", "Index of the column of the dataset that holds the target variable", typeof(IntData), VariableKind.In));
+      AddVariableInfo(new VariableInfo("TargetVariable", "Name of the target variable", typeof(StringData), VariableKind.In));
       AddVariableInfo(new VariableInfo("InputVariables", "List of allowed input variable names", typeof(ItemList), VariableKind.In));
       AddVariableInfo(new VariableInfo("SamplesStart", "Start index of samples in dataset to evaluate", typeof(IntData), VariableKind.In));
@@ -70 +70 @@
       abortRequested = false;
       Dataset dataset = GetVariableValue<Dataset>("Dataset", scope, true);
-      int targetVariable = GetVariableValue<IntData>("TargetVariable", scope, true).Data;
-      ItemList inputVaribales = GetVariableValue<ItemList>("InputVariables", scope, true);
-      var inputVariableNames = from x in inputVaribales
+      string targetVariable = GetVariableValue<StringData>("TargetVariable", scope, true).Data;
+      int targetVariableIndex = dataset.GetVariableIndex(targetVariable);
+      ItemList inputVariables = GetVariableValue<ItemList>("InputVariables", scope, true);
+      var inputVariableNames = from x in inputVariables
                                select ((StringData)x).Data;
       int start = GetVariableValue<IntData>("SamplesStart", scope, true).Data;
@@ -93 +94 @@
       parameter.Probability = false;
 
-      SVM.Problem problem = SVMHelper.CreateSVMProblem(dataset, targetVariable, inputVariableNames, start, end, minTimeOffset, maxTimeOffset);
+      SVM.Problem problem = SVMHelper.CreateSVMProblem(dataset, targetVariableIndex, inputVariableNames, start, end, minTimeOffset, maxTimeOffset);
       SVM.RangeTransform rangeTransform = SVM.RangeTransform.Compute(problem);
       SVM.Problem scaledProblem = rangeTransform.Scale(problem);