Changeset 2356 for trunk/sources/HeuristicLab.GP.StructureIdentification.Classification

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.

Location:

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

Files:

• HeuristicLab.GP.StructureIdentification.Classification-3.3.csproj (modified) (1 diff)
• OffspringSelectionGP.cs (modified) (1 diff)
• StandardGP.cs (modified) (1 diff)

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

@@ -81 +81 @@
   <ItemGroup>
     <Compile Include="ClassificationMeanSquaredErrorEvaluator.cs" />
-    <Compile Include="DefaultClassificationAlgorithmOperators.cs" />
     <Compile Include="GPClassificationEvaluatorBase.cs" />
     <Compile Include="CrossValidation.cs" />

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

@@ -23 +23 @@
 using HeuristicLab.Modeling;
 using HeuristicLab.Operators;
+using HeuristicLab.Data;
 
 namespace HeuristicLab.GP.StructureIdentification.Classification {
   public class OffspringSelectionGP : HeuristicLab.GP.StructureIdentification.OffspringSelectionGP, IClassificationAlgorithm {
 
-    protected override IOperator CreateProblemInjector() {
-      return DefaultClassificationAlgorithmOperators.CreateProblemInjector();
+    public override string Name {
+      get {
+        return base.Name + " - Classification";
+      }
     }
 
-    protected override IOperator CreatePostProcessingOperator() {
-      return DefaultClassificationAlgorithmOperators.CreatePostProcessingOperator();
+    protected override IOperator CreateProblemInjector() {
+      return DefaultClassificationOperators.CreateProblemInjector();
     }
 
-    protected override IAnalyzerModel CreateGPModel() {
-      IAnalyzerModel model = base.CreateGPModel();
-      DefaultClassificationAlgorithmOperators.SetModelData(model, Engine.GlobalScope.SubScopes[0]);
+    protected override IOperator CreateModelAnalyzerOperator() {
+      return DefaultClassificationOperators.CreatePostProcessingOperator();
+    }
+
+    protected virtual IAnalyzerModel CreateGPModel() {
+      IScope bestModelScope = Engine.GlobalScope.SubScopes[0];
+      var model = new AnalyzerModel();
+
+      model.SetMetaData("SelectionPressure", bestModelScope.GetVariableValue<DoubleData>("SelectionPressure", false).Data);
+      DefaultStructureIdentificationOperators.PopulateAnalyzerModel(bestModelScope, model);
+      DefaultClassificationOperators.PopulateAnalyzerModel(bestModelScope, model);
+
       return model;
     }

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

@@ -27 +27 @@
 namespace HeuristicLab.GP.StructureIdentification.Classification {
   public class StandardGP : HeuristicLab.GP.StructureIdentification.StandardGP, IClassificationAlgorithm {
+    public override string Name {
+      get {
+        return base.Name + " - Classification";
+      }
+    }
+
     protected override IOperator CreateProblemInjector() {
-      return DefaultClassificationAlgorithmOperators.CreateProblemInjector();
+      return DefaultClassificationOperators.CreateProblemInjector();
     }
-    
-    protected override IOperator CreatePostProcessingOperator() {
-      return DefaultClassificationAlgorithmOperators.CreatePostProcessingOperator();
+
+    protected override IOperator CreateModelAnalyzerOperator() {
+      return DefaultClassificationOperators.CreatePostProcessingOperator();
     }
 
     protected override IAnalyzerModel CreateGPModel() {
-      IAnalyzerModel model = base.CreateGPModel();
-      DefaultClassificationAlgorithmOperators.SetModelData(model, Engine.GlobalScope.SubScopes[0]);
+      var model = new AnalyzerModel();
+      var bestModelScope = Engine.GlobalScope.SubScopes[0];
+      DefaultStructureIdentificationOperators.PopulateAnalyzerModel(bestModelScope, model);
+      DefaultClassificationOperators.PopulateAnalyzerModel(bestModelScope, model);
       return model;
     }