Changeset 2038 for trunk/sources/HeuristicLab.Modeling

Timestamp:

06/10/09 10:46:56 (16 years ago)

Author:

gkronber

Message:

• Renamed VariableImpactCalculator to VariableQualityImpactCalculator and calculate the ratio of new quality value to old quality value to get an idea how the quality value is influenced by each variable.
• Changes in Dataset to improve the speed of SetValue (only set a dirty flag instead of reallocating the caches)

#644 (Variable impact of CEDMA models should be calculated and stored in the result DB)

Location:

trunk/sources/HeuristicLab.Modeling/3.2

Files:

• HeuristicLab.Modeling-3.2.csproj (modified) (2 diffs)
• VariableQualityImpactCalculator.cs (moved) (moved from trunk/sources/HeuristicLab.Modeling/3.2/VariableImpactCalculator.cs) (5 diffs)

trunk/sources/HeuristicLab.Modeling/3.2/HeuristicLab.Modeling-3.2.csproj

@@ -83 +83 @@
   <ItemGroup>
     <Compile Include="ClassificationProblemInjector.cs" />
-    <Compile Include="VariableImpactCalculator.cs" />
     <Compile Include="Model.cs" />
     <Compile Include="IModel.cs" />
@@ -106 +105 @@
     <Compile Include="TimeSeriesProblemInjector.cs" />
     <Compile Include="SimpleVarianceAccountedForEvaluator.cs" />
+    <Compile Include="VariableQualityImpactCalculator.cs" />
   </ItemGroup>
   <ItemGroup>

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

@@ -30 +30 @@
 
 namespace HeuristicLab.Modeling {
-  public class VariableImpactCalculator : OperatorBase {
+  public class VariableQualityImpactCalculator : OperatorBase {
     public override string Description {
       get { return @"Calculates the impact of all allowed input variables on the quality of the model using evaluator supplied as suboperator."; }
     }
 
-    public VariableImpactCalculator()
+    public VariableQualityImpactCalculator()
       : base() {
       AddVariableInfo(new VariableInfo("Dataset", "Dataset", typeof(Dataset), VariableKind.In));
@@ -42 +42 @@
       AddVariableInfo(new VariableInfo("TrainingSamplesStart", "TrainingSamplesStart", typeof(IntData), VariableKind.In));
       AddVariableInfo(new VariableInfo("TrainingSamplesEnd", "TrainingSamplesEnd", typeof(IntData), VariableKind.In));
-      AddVariableInfo(new VariableInfo("VariableImpacts", "Variable impacts", typeof(ItemList), VariableKind.New));
+      AddVariableInfo(new VariableInfo("VariableQualityImpacts", "Effect on quality of model (percentage of original quality) if variable is replaced by its mean.", typeof(ItemList), VariableKind.New));
     }
 
@@ -53 +53 @@
       int end = GetVariableValue<IntData>("TrainingSamplesEnd", scope, true).Data;
 
-      if (SubOperators.Count < 1) throw new InvalidOperationException("VariableImpactCalculator needs a suboperator to evaluate the model");
+      if (SubOperators.Count < 1) throw new InvalidOperationException("VariableQualityImpactCalculator needs a suboperator to evaluate the model");
       IOperator evaluationOperator = this.SubOperators[0];
-
-      ItemList variableImpacts = new ItemList();
+      ItemList variableQualityImpacts = new ItemList();
 
       // calculateReferenceQuality
@@ -65 +64 @@
         var oldValues = ReplaceVariableValues(dirtyDataset, currentVariable , CalculateNewValues(dirtyDataset, currentVariable, start, end), start, end);
         double newQuality = CalculateQuality(scope, dirtyDataset, evaluationOperator);
-        double ratio = referenceQuality / newQuality;
-        double impact = ratio < 1.0 ? 1.0 - ratio : 1.0 - 1.0 / ratio;
+        double ratio = newQuality / referenceQuality;
         ItemList row = new ItemList();
         row.Add(new StringData(dataset.GetVariableName(currentVariable)));
-        row.Add(new DoubleData(impact));
-        variableImpacts.Add(row);
+        row.Add(new DoubleData(ratio));
+        variableQualityImpacts.Add(row);
         ReplaceVariableValues(dirtyDataset, currentVariable, oldValues, start, end);
       }
-      scope.AddVariable(new Variable(scope.TranslateName("VariableImpacts"), variableImpacts));
+      scope.AddVariable(new Variable(scope.TranslateName("VariableQualityImpacts"), variableQualityImpacts));
       return null;
     }
@@ -93 +91 @@
 
       int index = start;
+      ds.FireChangeEvents = false;
       foreach(double v in newValues) {
         ds.SetValue(index++, variableIndex, v);
       }
+      ds.FireChangeEvents = true;
+      ds.FireChanged();
       return oldValues;
     }