Changeset 2362 for trunk

Timestamp:

09/15/09 18:16:05 (15 years ago)

Author:

gkronber

Message:

Fixed #741 (EvaluatedSolutions counter and current selection pressure is stored incorrectly in models generated by GP algorithms).

Location:

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3

Files:

• DefaultStructureIdentificationOperators.cs (modified) (1 diff)
• OffspringSelectionGPRegression.cs (modified) (2 diffs)
• StandardGPRegression.cs (modified) (2 diffs)

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

@@ -71 +71 @@
       solutionStorer.GetVariableInfo("BestSolution").ActualName = "BestValidationSolution";
       solutionStorer.GetVariableInfo("Quality").ActualName = "ValidationQuality";
+
+      OperatorExtractor bestSolutionProcessor = new OperatorExtractor();
+      bestSolutionProcessor.Name = "BestSolutionProcessor (extr.)";
+      bestSolutionProcessor.GetVariableInfo("Operator").ActualName = "BestSolutionProcessor";
+
+      solutionStorer.AddSubOperator(bestSolutionProcessor);
 
       BestAverageWorstQualityCalculator validationQualityCalculator = new BestAverageWorstQualityCalculator();

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

@@ -31 +31 @@
 using HeuristicLab.Modeling;
 using HeuristicLab.DataAnalysis;
+using HeuristicLab.Operators.Programmable;
 
 namespace HeuristicLab.GP.StructureIdentification {
@@ -94 +95 @@
 
     protected override IOperator CreateGenerationStepHook() {
-      return DefaultStructureIdentificationOperators.CreateGenerationStepHook();
+      IOperator hook = DefaultStructureIdentificationOperators.CreateGenerationStepHook();
+      hook.AddSubOperator(CreateBestSolutionProcessor());
+      return hook;
+    }
+
+    private IOperator CreateBestSolutionProcessor() {
+      CombinedOperator op = new CombinedOperator();
+      op.Name = "BestSolutionProcessor";
+      SequentialProcessor seq = new SequentialProcessor();
+
+      ProgrammableOperator variableStorer = new ProgrammableOperator();
+      variableStorer.RemoveVariableInfo("Result");
+      variableStorer.AddVariableInfo(new VariableInfo("Input", "Value to copy", typeof(ObjectData), VariableKind.In));
+      variableStorer.AddVariableInfo(new VariableInfo("Output", "Value to write", typeof(ObjectData), VariableKind.Out));
+      variableStorer.Code = "scope.AddVariable(new HeuristicLab.Core.Variable(scope.TranslateName(\"Output\"), (ObjectData)Input.Clone()));";
+
+      IOperator evaluatedSolutionsStorer = (IOperator)variableStorer.Clone();
+      evaluatedSolutionsStorer.GetVariableInfo("Input").ActualName = "EvaluatedSolutions";
+      evaluatedSolutionsStorer.GetVariableInfo("Output").ActualName = "EvaluatedSolutions";
+
+      IOperator selectionPressureStorer = (IOperator)variableStorer.Clone();
+      selectionPressureStorer.GetVariableInfo("Input").ActualName = "SelectionPressure";
+      selectionPressureStorer.GetVariableInfo("Output").ActualName = "SelectionPressure";
+
+      seq.AddSubOperator(evaluatedSolutionsStorer);
+      seq.AddSubOperator(selectionPressureStorer);
+
+      op.OperatorGraph.AddOperator(seq);
+      op.OperatorGraph.InitialOperator = seq;
+      return op;
     }
 

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

@@ -30 +30 @@
 using System;
 using HeuristicLab.DataAnalysis;
+using HeuristicLab.Operators.Programmable;
 
 namespace HeuristicLab.GP.StructureIdentification {
@@ -149 +150 @@
     }
 
+    private IOperator CreateBestSolutionProcessor() {
+      CombinedOperator op = new CombinedOperator();
+      op.Name = "BestSolutionProcessor";
+      SequentialProcessor seq = new SequentialProcessor();
+
+      ProgrammableOperator evaluatedSolutionsStorer = new ProgrammableOperator();
+      evaluatedSolutionsStorer.RemoveVariableInfo("Result");
+      evaluatedSolutionsStorer.AddVariableInfo(new VariableInfo("Input", "Value to copy", typeof(IntData), VariableKind.In));
+      evaluatedSolutionsStorer.AddVariableInfo(new VariableInfo("Output", "Value to write", typeof(IntData), VariableKind.New));
+      evaluatedSolutionsStorer.GetVariableInfo("Input").ActualName = "EvaluatedSolutions";
+      evaluatedSolutionsStorer.GetVariableInfo("Output").ActualName = "EvaluatedSolutions";
+      evaluatedSolutionsStorer.Code = "Output.Data = Input.Data;";
+
+      seq.AddSubOperator(evaluatedSolutionsStorer);
+
+      op.OperatorGraph.AddOperator(seq);
+      op.OperatorGraph.InitialOperator = seq;
+      return op;
+    }
+
+
     protected virtual IOperator CreateModelAnalyzerOperator() {
       return DefaultRegressionOperators.CreatePostProcessingOperator();