Changeset 2319 for trunk/sources/HeuristicLab.GP.StructureIdentification

Timestamp:

09/01/09 11:09:50 (16 years ago)

Author:

gkronber

Message:

Applied patch from mkommend for variable impact calculators and adapted data-modeling algorithms to use the new operators for variable impact calculation. #728

Location:

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3

Files:

• BaseClasses/AlgorithmBase.cs (modified) (3 diffs)
• Evaluators/VariableEvaluationImpactCalculator.cs (deleted)
• Evaluators/VariableQualityImpactCalculator.cs (deleted)
• HeuristicLab.GP.StructureIdentification-3.3.csproj (modified) (2 diffs)
• PredictorBuilder.cs (added)
• StandardGP.cs (modified) (1 diff)
• VariableNamesExtractor.cs (added)

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/BaseClasses/AlgorithmBase.cs ¶

@@ -311 +311 @@
 
     protected internal virtual IOperator CreateBestSolutionProcessor() {
-      return new EmptyOperator();
+      SequentialProcessor seq = new SequentialProcessor();
+      // calculate and set variable impacts
+      VariableNamesExtractor namesExtractor = new VariableNamesExtractor();
+      namesExtractor.GetVariableInfo("VariableNames").ActualName = "InputVariableNames";
+      PredictorBuilder predictorBuilder = new PredictorBuilder();
+
+      VariableEvaluationImpactCalculator evaluationImpactCalculator = new VariableEvaluationImpactCalculator();
+      evaluationImpactCalculator.GetVariableInfo("SamplesStart").ActualName = "ActualTrainingSamplesStart";
+      evaluationImpactCalculator.GetVariableInfo("SamplesEnd").ActualName = "ActualTrainingSamplesEnd";
+      VariableQualityImpactCalculator qualityImpactCalculator = new VariableQualityImpactCalculator();
+      qualityImpactCalculator.GetVariableInfo("SamplesStart").ActualName = "ActualTrainingSamplesStart";
+      qualityImpactCalculator.GetVariableInfo("SamplesEnd").ActualName = "ActualTrainingSamplesEnd";
+
+      seq.AddSubOperator(namesExtractor);
+      seq.AddSubOperator(predictorBuilder);
+      seq.AddSubOperator(evaluationImpactCalculator);
+      seq.AddSubOperator(qualityImpactCalculator);
+      return seq;
     }
 
@@ -410 +427 @@
 
     protected internal virtual IAnalyzerModel CreateGPModel(IScope bestModelScope) {
-      Engine.GlobalScope.AddSubScope(bestModelScope);
-      IGeneticProgrammingModel tree = bestModelScope.GetVariableValue<IGeneticProgrammingModel>("FunctionTree", false);
-      ITreeEvaluator evaluator = bestModelScope.GetVariableValue<ITreeEvaluator>("TreeEvaluator", true);
       IAnalyzerModel model = new AnalyzerModel();
-      model.Predictor = new Predictor(evaluator, tree);
+      model.Predictor = bestModelScope.GetVariableValue<IPredictor>("Predictor", true);
       Dataset ds = bestModelScope.GetVariableValue<Dataset>("Dataset", true);
       model.Dataset = ds;
@@ -427 +441 @@
       model.TrainingMeanSquaredError = bestModelScope.GetVariableValue<DoubleData>("Quality", false).Data;
       model.ValidationMeanSquaredError = bestModelScope.GetVariableValue<DoubleData>("ValidationQuality", false).Data;
-      // calculate and set variable impacts
-      VariableEvaluationImpactCalculator evaluationImpactCalculator = new VariableEvaluationImpactCalculator();
-      evaluationImpactCalculator.GetVariableInfo("TrainingSamplesStart").ActualName = "ActualTrainingSamplesStart";
-      evaluationImpactCalculator.GetVariableInfo("TrainingSamplesEnd").ActualName = "ActualTrainingSamplesEnd";
-      VariableQualityImpactCalculator qualityImpactCalculator = new VariableQualityImpactCalculator();
-      qualityImpactCalculator.GetVariableInfo("TrainingSamplesStart").ActualName = "ActualTrainingSamplesStart";
-      qualityImpactCalculator.GetVariableInfo("TrainingSamplesEnd").ActualName = "ActualTrainingSamplesEnd";
-        
-
-      evaluationImpactCalculator.Apply(bestModelScope);
-      qualityImpactCalculator.Apply(bestModelScope);
 
       ItemList evaluationImpacts = bestModelScope.GetVariableValue<ItemList>("VariableEvaluationImpacts", false);

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/HeuristicLab.GP.StructureIdentification-3.3.csproj ¶

@@ -85 +85 @@
     <Compile Include="BaseClasses\FunctionTreeBase.cs" />
     <Compile Include="BaseClasses\TreeEvaluatorBase.cs" />
+    <Compile Include="PredictorBuilder.cs" />
     <Compile Include="Predictor.cs" />
     <Compile Include="Evaluators\SimpleGPEvaluatorBase.cs" />
@@ -145 +146 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="SymbolicExpressionExporter.cs" />
-    <Compile Include="Evaluators\VariableEvaluationImpactCalculator.cs" />
-    <Compile Include="Evaluators\VariableQualityImpactCalculator.cs" />
+    <Compile Include="VariableNamesExtractor.cs" />
   </ItemGroup>
   <ItemGroup>

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/StandardGP.cs ¶

@@ -203 +203 @@
     }
 
-    protected internal override IOperator CreateBestSolutionProcessor() {
+    protected internal override IOperator CreateBestSolutionProcessor() {      
       SequentialProcessor bestSolutionProcessor = new SequentialProcessor();
+      bestSolutionProcessor.AddSubOperator(base.CreateBestSolutionProcessor());
+
       #region MSE
       MeanSquaredErrorEvaluator testMseEvaluator = new MeanSquaredErrorEvaluator();