Changeset 2165 for trunk/sources/HeuristicLab.Modeling/3.2

Timestamp:

07/16/09 11:34:22 (15 years ago)

Author:

gkronber

Message:

Removed variable AllowedFeatures in all modeling algorithms. #709

Location:

trunk/sources/HeuristicLab.Modeling/3.2

Files:

• ProblemInjector.cs (modified) (2 diffs)
• VariableEvaluationImpactCalculator.cs (modified) (2 diffs)
• VariableImpactCalculatorBase.cs (modified) (6 diffs)
• VariableQualityImpactCalculator.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Modeling/3.2/ProblemInjector.cs

@@ -77 +77 @@
 
       AddVariableInfo(new VariableInfo("MaxNumberOfTrainingSamples", "Maximal number of training samples to use (optional)", typeof(IntData), VariableKind.In));
+      AddVariableInfo(new VariableInfo("NumberOfInputVariables", "The number of available input variables", typeof(IntData), VariableKind.New));
     }
 
@@ -97 +98 @@
       Dataset scopeDataset = CreateNewDataset(operatorDataset, targetVariable, operatorAllowedFeatures);
 
-      ItemList<IntData> allowedFeatures = new ItemList<IntData>();
-      allowedFeatures.AddRange(Enumerable.Range(1, scopeDataset.Columns -1 ).Select(x=>new IntData(x)));
-
       scope.AddVariable(new Variable("Dataset", scopeDataset));
-      scope.AddVariable(new Variable("AllowedFeatures", allowedFeatures));
       scope.AddVariable(new Variable("TargetVariable", new IntData(0)));
+      scope.AddVariable(new Variable("NumberOfInputVariables", new IntData(scopeDataset.Columns - 1)));
 
       int trainingStart = GetVariableValue<IntData>("TrainingSamplesStart", scope, true).Data;

trunk/sources/HeuristicLab.Modeling/3.2/VariableEvaluationImpactCalculator.cs

@@ -58 +58 @@
     }
 
-    protected override double[] CalculateValue(IScope scope, Dataset dataset, int targetVariable, ItemList<IntData> allowedFeatures, int start, int end) {
-      return GetOutputs(scope, dataset, targetVariable, allowedFeatures, start, end);
+    protected override double[] CalculateValue(IScope scope, Dataset dataset, int targetVariable, int start, int end) {
+      return GetOutputs(scope, dataset, targetVariable, start, end);
     }
 
@@ -75 +75 @@
     }
 
-    protected abstract double[] GetOutputs(IScope scope, Dataset dataset, int targetVariable, ItemList<IntData> allowedFeatures, int start, int end);
+    protected abstract double[] GetOutputs(IScope scope, Dataset dataset, int targetVariable, int start, int end);
   }
 }

trunk/sources/HeuristicLab.Modeling/3.2/VariableImpactCalculatorBase.cs

@@ -34 +34 @@
 
     public override string Description {
-      get { return @"Calculates the impact of all allowed input variables on the model."; }
+      get { return @"Calculates the impact of all input variables on the model."; }
     }
 
@@ -47 +47 @@
       AddVariableInfo(new VariableInfo("Dataset", "Dataset", typeof(Dataset), VariableKind.In));
       AddVariableInfo(new VariableInfo("TargetVariable", "TargetVariable", typeof(IntData), VariableKind.In));
-      AddVariableInfo(new VariableInfo("AllowedFeatures", "Indexes of allowed input variables", typeof(ItemList<IntData>), VariableKind.In));
       AddVariableInfo(new VariableInfo("TrainingSamplesStart", "TrainingSamplesStart", typeof(IntData), VariableKind.In));
       AddVariableInfo(new VariableInfo("TrainingSamplesEnd", "TrainingSamplesEnd", typeof(IntData), VariableKind.In));
@@ -54 +53 @@
 
     public override IOperation Apply(IScope scope) {
-      ItemList<IntData> allowedFeatures = GetVariableValue<ItemList<IntData>>("AllowedFeatures", scope, true);
       int targetVariable = GetVariableValue<IntData>("TargetVariable", scope, true).Data;
       Dataset dataset = GetVariableValue<Dataset>("Dataset", scope, true);
@@ -61 +59 @@
       int end = GetVariableValue<IntData>("TrainingSamplesEnd", scope, true).Data;
 
-      T referenceValue = CalculateValue(scope, dataset, targetVariable, allowedFeatures, start, end);
-      double[] impacts = new double[allowedFeatures.Count];
+      T referenceValue = CalculateValue(scope, dataset, targetVariable, start, end);
+      double[] impacts = new double[dataset.Columns];
 
-      for (int i = 0; i < allowedFeatures.Count && !abortRequested; i++) {
-        int currentVariable = allowedFeatures[i].Data;
-        var oldValues = ReplaceVariableValues(dirtyDataset, currentVariable, CalculateNewValues(dirtyDataset, currentVariable, start, end), start, end);
-        T newValue = CalculateValue(scope, dirtyDataset, targetVariable, allowedFeatures, start, end);
-        impacts[i] = CalculateImpact(referenceValue, newValue);
-        ReplaceVariableValues(dirtyDataset, currentVariable, oldValues, start, end);
+      for (int i = 0; i < impacts.Length && !abortRequested; i++) {
+        int currentVariable = i;
+        if (currentVariable != targetVariable) {
+          var oldValues = ReplaceVariableValues(dirtyDataset, currentVariable, CalculateNewValues(dirtyDataset, currentVariable, start, end), start, end);
+          T newValue = CalculateValue(scope, dirtyDataset, targetVariable, start, end);
+          impacts[i] = CalculateImpact(referenceValue, newValue);
+          ReplaceVariableValues(dirtyDataset, currentVariable, oldValues, start, end);
+        }
       }
 
@@ -76 +76 @@
 
         ItemList variableImpacts = new ItemList();
-        for (int i = 0; i < allowedFeatures.Count; i++) {
-          int currentVariable = allowedFeatures[i].Data;
-          ItemList row = new ItemList();
-          row.Add(new StringData(dataset.GetVariableName(currentVariable)));
-          row.Add(new DoubleData(impacts[i]));
-          variableImpacts.Add(row);
+        for (int i = 0; i < impacts.Length; i++) {
+          int currentVariable = i;
+          if (currentVariable != targetVariable) {
+            ItemList row = new ItemList();
+            row.Add(new StringData(dataset.GetVariableName(currentVariable)));
+            row.Add(new DoubleData(impacts[i]));
+            variableImpacts.Add(row);
+          }
         }
 
@@ -91 +93 @@
     }
 
-    protected abstract T CalculateValue(IScope scope, Dataset dataset, int targetVariable, ItemList<IntData> allowedFeatures, int start, int end);
+    protected abstract T CalculateValue(IScope scope, Dataset dataset, int targetVariable, int start, int end);
 
     protected abstract double CalculateImpact(T referenceValue, T newValue);

trunk/sources/HeuristicLab.Modeling/3.2/VariableQualityImpactCalculator.cs

@@ -43 +43 @@
     }
 
-    protected override double CalculateValue(IScope scope, Dataset dataset, int targetVariable, ItemList<IntData> allowedFeatures, int start, int end) {
-      return CalculateQuality(scope, dataset, targetVariable, allowedFeatures, start, end);
+    protected override double CalculateValue(IScope scope, Dataset dataset, int targetVariable, int start, int end) {
+      return CalculateQuality(scope, dataset, targetVariable, start, end);
     }
 
-    protected abstract double CalculateQuality(IScope scope, Dataset dataset, int targetVariable, ItemList<IntData> allowedFeatures, int start, int end);
+    protected abstract double CalculateQuality(IScope scope, Dataset dataset, int targetVariable, int start, int end);
   }
 }