Changeset 2356 for trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/OffspringSelectionGP.cs

Timestamp:

09/15/09 14:01:47 (15 years ago)

Author:

gkronber

Message:

Moved common (not algorithm specific) model analyzer code (same operator tree in all regression/classification/time-series-prognosis engines) to HL.Modeling. #625, #705, #739.

File:

• trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/OffspringSelectionGP.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/OffspringSelectionGP.cs

@@ -77 +77 @@
 
     protected override IOperator CreateFunctionLibraryInjector() {
-      return DefaultStructureIdentificationAlgorithmOperators.CreateFunctionLibraryInjector();
+      return DefaultStructureIdentificationOperators.CreateFunctionLibraryInjector();
     }
 
     protected override IOperator CreateProblemInjector() {
-      return DefaultStructureIdentificationAlgorithmOperators.CreateProblemInjector();
+      return DefaultRegressionOperators.CreateProblemInjector();
     }
 
     protected override IOperator CreateInitialPopulationEvaluator() {
-      return DefaultStructureIdentificationAlgorithmOperators.CreateInitialPopulationEvaluator();
+      return DefaultStructureIdentificationOperators.CreateInitialPopulationEvaluator();
     }
 
     protected override IOperator CreateEvaluationOperator() {
-      return DefaultStructureIdentificationAlgorithmOperators.CreateEvaluator();
+      return DefaultStructureIdentificationOperators.CreateEvaluator();
     }
 
 
     protected override IOperator CreateGenerationStepHook() {
-      return DefaultStructureIdentificationAlgorithmOperators.CreateGenerationStepHook();
+      return DefaultStructureIdentificationOperators.CreateGenerationStepHook();
     }
 
@@ -133 +133 @@
 
     protected override IOperator CreatePostProcessingOperator() {
-      return DefaultStructureIdentificationAlgorithmOperators.CreatePostProcessingOperator();
+      CombinedOperator op = new CombinedOperator();
+      op.Name = "ModelAnalyser";
+      SequentialProcessor seq = new SequentialProcessor();
+      seq.AddSubOperator(DefaultStructureIdentificationOperators.CreatePreparationForPostProcessingOperator());
+
+      UniformSequentialSubScopesProcessor subScopesProc = new UniformSequentialSubScopesProcessor();
+      SequentialProcessor solutionProc = new SequentialProcessor();
+      solutionProc.AddSubOperator(CreateModelAnalyzerOperator());
+
+      subScopesProc.AddSubOperator(solutionProc);
+      seq.AddSubOperator(subScopesProc);
+
+      op.OperatorGraph.AddOperator(seq);
+      op.OperatorGraph.InitialOperator = seq;
+      return op;
+    }
+
+    protected virtual IOperator CreateModelAnalyzerOperator() {
+      return DefaultRegressionOperators.CreatePostProcessingOperator();
     }
 
@@ -148 +166 @@
     protected virtual IAnalyzerModel CreateGPModel() {
       IScope bestModelScope = Engine.GlobalScope.SubScopes[0];
-      IAnalyzerModel model = DefaultStructureIdentificationAlgorithmOperators.CreateGPModel(bestModelScope);
-      model.SetMetaData("SelectionPressure", bestModelScope.GetVariableValue<DoubleData>("SelectionPressure", true).Data);
+      var model = new AnalyzerModel();
+
+      model.SetMetaData("SelectionPressure", bestModelScope.GetVariableValue<DoubleData>("SelectionPressure", false).Data);
+      DefaultStructureIdentificationOperators.PopulateAnalyzerModel(bestModelScope, model);
+      DefaultRegressionOperators.PopulateAnalyzerModel(bestModelScope, model);
+
       return model;
     }