Changeset 2290 for trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/Evaluators

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)

Location:

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/Evaluators

Files:

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

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/Evaluators/VariableEvaluationImpactCalculator.cs

@@ -32 +32 @@
       AddVariableInfo(new VariableInfo("TreeEvaluator", "The evaluator that should be used to evaluate the expression tree", typeof(ITreeEvaluator), VariableKind.In));
       AddVariableInfo(new VariableInfo("FunctionTree", "The function tree that should be evaluated", typeof(IGeneticProgrammingModel), VariableKind.In));
-      AddVariableInfo(new VariableInfo("TreeSize", "Size (number of nodes) of the tree to evaluate", typeof(IntData), VariableKind.In));
     }
 
@@ -39 +38 @@
       ITreeEvaluator evaluator = GetVariableValue<ITreeEvaluator>("TreeEvaluator", scope, true);
       IGeneticProgrammingModel gpModel = GetVariableValue<IGeneticProgrammingModel>("FunctionTree", scope, true);
-      double punishmentFactor = GetVariableValue<DoubleData>("PunishmentFactor", scope, true).Data;
       evaluator.PrepareForEvaluation(dataset, targetVariable, start, end, gpModel.FunctionTree);
 

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/Evaluators/VariableQualityImpactCalculator.cs

@@ -38 +38 @@
       ITreeEvaluator evaluator = GetVariableValue<ITreeEvaluator>("TreeEvaluator", scope, true);
       IGeneticProgrammingModel gpModel = GetVariableValue<IGeneticProgrammingModel>("FunctionTree", scope, true);
-      double punishmentFactor = GetVariableValue<DoubleData>("PunishmentFactor", scope, true).Data;
       evaluator.PrepareForEvaluation(dataset, targetVariable, start, end, gpModel.FunctionTree);