Changeset 2385 for trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/OffspringSelectionGPRegression.cs

Timestamp:

09/24/09 11:37:28 (15 years ago)

Author:

gkronber

Message:

Implemented #762 (ValidationQuality improvment progress as additional stopping criterion for default StructId Engines)

File:

• trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/OffspringSelectionGPRegression.cs (modified) (6 diffs)

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

@@ -33 +33 @@
 using HeuristicLab.DataAnalysis;
 using HeuristicLab.Operators.Programmable;
+using HeuristicLab.GP.Algorithms;
 
 namespace HeuristicLab.GP.StructureIdentification {
@@ -100 +101 @@
       get { return GetVariableInjector().GetVariable("PunishmentFactor").GetValue<DoubleData>().Data; }
       set { GetVariableInjector().GetVariable("PunishmentFactor").GetValue<DoubleData>().Data = value; }
+    }
+
+    public virtual int MaxBestValidationSolutionAge {
+      get { return GetVariableInjector().GetVariable("MaxBestValidationSolutionAge").GetValue<IntData>().Data; }
+      set { GetVariableInjector().GetVariable("MaxBestValidationSolutionAge").GetValue<IntData>().Data = value; }
     }
 
@@ -116 +122 @@
       : base() {
       PunishmentFactor = 10.0;
+      MaxBestValidationSolutionAge = 10;
     }
 
@@ -160 +167 @@
       selectionPressureStorer.GetVariableInfo("Output").ActualName = "SelectionPressure";
 
+      ProgrammableOperator resetBestSolutionAge = new ProgrammableOperator();
+      resetBestSolutionAge.RemoveVariable("Result");
+      resetBestSolutionAge.AddVariableInfo(
+        new VariableInfo("BestValidationSolutionAge", "Age of best validation solution", typeof(IntData), VariableKind.In | VariableKind.Out));
+      resetBestSolutionAge.Code = "BestValidationSolutionAge.Data = 0;";
+
       seq.AddSubOperator(evaluatedSolutionsStorer);
       seq.AddSubOperator(selectionPressureStorer);
+      seq.AddSubOperator(resetBestSolutionAge);
 
       op.OperatorGraph.AddOperator(seq);
@@ -171 +185 @@
       VariableInjector injector = base.CreateGlobalInjector();
       injector.AddVariable(new HeuristicLab.Core.Variable("PunishmentFactor", new DoubleData()));
+      injector.AddVariable(new HeuristicLab.Core.Variable("BestValidationSolutionAge", new IntData()));
+      injector.AddVariable(new HeuristicLab.Core.Variable("MaxBestValidationSolutionAge", new IntData()));
       return injector;
     }
@@ -203 +219 @@
     }
 
+    protected override IOperator CreateTerminationCondition() {
+      CombinedOperator terminationCritertion = new CombinedOperator();
+      terminationCritertion.Name = "TerminationCondition";
+      GreaterThanComparator bestSolutionAge = new GreaterThanComparator();
+      bestSolutionAge.GetVariableInfo("LeftSide").ActualName = "BestValidationSolutionAge";
+      bestSolutionAge.GetVariableInfo("RightSide").ActualName = "MaxBestValidationSolutionAge";
+      bestSolutionAge.GetVariableInfo("Result").ActualName = "TerminationCriterion";
+
+      IOperator combinedTerminationCriterion = AlgorithmBase.CombineTerminationCriterions(base.CreateTerminationCondition(), bestSolutionAge);
+
+      terminationCritertion.OperatorGraph.AddOperator(combinedTerminationCriterion);
+      terminationCritertion.OperatorGraph.InitialOperator = combinedTerminationCriterion;
+      return terminationCritertion;
+    }
+
     protected override IOperator CreatePostProcessingOperator() {
       CombinedOperator op = new CombinedOperator();