Changeset 2385 for trunk

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)

Location:

trunk/sources

Files:

• HeuristicLab.GP.Algorithms/3.2/AlgorithmBase.cs (modified) (1 diff)
• HeuristicLab.GP.Algorithms/3.2/OffspringSelectionGP.cs (modified) (2 diffs)
• HeuristicLab.GP.StructureIdentification/3.3/DefaultStructureIdentificationOperators.cs (modified) (2 diffs)
• HeuristicLab.GP.StructureIdentification/3.3/OffspringSelectionGPRegression.cs (modified) (6 diffs)
• HeuristicLab.GP.StructureIdentification/3.3/StandardGPRegression.cs (modified) (6 diffs)

trunk/sources/HeuristicLab.GP.Algorithms/3.2/AlgorithmBase.cs

@@ -495 +495 @@
     }
     #endregion
+
+
+    public static IOperator CombineTerminationCriterions(IOperator criterion1, IOperator criterion2) {
+      ConditionalBranch branch = new ConditionalBranch();
+      branch.GetVariableInfo("Condition").ActualName = "TerminationCriterion";
+      branch.AddSubOperator(new EmptyOperator());
+      branch.AddSubOperator(criterion2);
+
+      SequentialProcessor seq = new SequentialProcessor();
+      seq.AddSubOperator(criterion1);
+      seq.AddSubOperator(branch);
+
+      return seq;
+    }
   }
 }

trunk/sources/HeuristicLab.GP.Algorithms/3.2/OffspringSelectionGP.cs

@@ -178 +178 @@
       selPresComparator.GetVariableInfo("Result").ActualName = "TerminationCriterion";
 
-      IOperator baseAndSelPresTerminationCriterion = CombineTerminationCriterions(base.CreateTerminationCondition(), selPresComparator);
+      IOperator baseAndSelPresTerminationCriterion = AlgorithmBase.CombineTerminationCriterions(base.CreateTerminationCondition(), selPresComparator);
 
       GreaterThanComparator evalSolutionsComparer = new GreaterThanComparator();
@@ -185 +185 @@
       evalSolutionsComparer.GetVariableInfo("Result").ActualName = "TerminationCriterion";
 
-      IOperator combinedTerminationCritertion = CombineTerminationCriterions(baseAndSelPresTerminationCriterion, evalSolutionsComparer);
+      IOperator combinedTerminationCritertion = AlgorithmBase.CombineTerminationCriterions(baseAndSelPresTerminationCriterion, evalSolutionsComparer);
 
       terminationCritertion.OperatorGraph.AddOperator(combinedTerminationCritertion);
       terminationCritertion.OperatorGraph.InitialOperator = combinedTerminationCritertion;
       return terminationCritertion;
-    }
-
-    private IOperator CombineTerminationCriterions(IOperator criterion1, IOperator criterion2) {
-      ConditionalBranch branch = new ConditionalBranch();
-      branch.GetVariableInfo("Condition").ActualName = "TerminationCriterion";
-      branch.AddSubOperator(new EmptyOperator());
-      branch.AddSubOperator(criterion2);
-
-      SequentialProcessor seq = new SequentialProcessor();
-      seq.AddSubOperator(criterion1);
-      seq.AddSubOperator(branch);
-
-      return seq;
     }
 

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

@@ -68 +68 @@
       individualProc.AddSubOperator(validationEvaluator);
 
+      Counter bestValidationSolutionAgeCounter = new Counter();
+      bestValidationSolutionAgeCounter.Name = "BestSolutionAgeCounter";
+      bestValidationSolutionAgeCounter.GetVariableInfo("Value").ActualName = "BestValidationSolutionAge";
+
       BestSolutionStorer solutionStorer = new BestSolutionStorer();
       solutionStorer.GetVariableInfo("BestSolution").ActualName = "BestValidationSolution";
@@ -88 +92 @@
 
       seq.AddSubOperator(subScopesProc);
+      seq.AddSubOperator(bestValidationSolutionAgeCounter);
       seq.AddSubOperator(solutionStorer);
       seq.AddSubOperator(validationQualityCalculator);

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();

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

@@ -32 +32 @@
 using HeuristicLab.DataAnalysis;
 using HeuristicLab.Operators.Programmable;
+using HeuristicLab.GP.Algorithms;
 
 namespace HeuristicLab.GP.StructureIdentification {
@@ -101 +102 @@
       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 @@
     public StandardGPRegression()
       : base() {
-
       PunishmentFactor = 10.0;
+      MaxBestValidationSolutionAge = 15;
     }
 
@@ -156 +162 @@
       evaluatedSolutionsStorer.Code = "Output.Data = Input.Data;";
 
+      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(resetBestSolutionAge);
 
       op.OperatorGraph.AddOperator(seq);
@@ -167 +180 @@
       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;
     }
@@ -197 +212 @@
     }
 
+    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();