Changeset 12534 for branches/ALPS

Timestamp:

06/29/15 17:09:30 (9 years ago)

Author:

pfleck

Message:

#2350 Added Termination Criteria to Steady-State ALPS.

Location:

branches/ALPS/HeuristicLab.Algorithms.ALPS.SteadyState/3.3

Files:

• AlpsSsGeneticAlgorithm.cs (modified) (8 diffs)
• AlpsSsGeneticAlgorithmMainLoop.cs (modified) (4 diffs)

branches/ALPS/HeuristicLab.Algorithms.ALPS.SteadyState/3.3/AlpsSsGeneticAlgorithm.cs

@@ -21 +21 @@
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using HeuristicLab.Common;
@@ -43 +44 @@
       get { return (IValueParameter<IntValue>)Parameters["LayerSize"]; }
     }
-    private IValueParameter<IntValue> MaximumIterationsParameter {
-      get { return (IValueParameter<IntValue>)Parameters["MaximumIterations"]; }
-    }
     public IConstrainedValueParameter<ISelector> SelectorParameter {
       get { return (IConstrainedValueParameter<ISelector>)Parameters["Selector"]; }
@@ -74 +72 @@
       set { LayerSizeParameter.Value = value; }
     }
-    public IntValue MaximumIterations {
-      get { return MaximumIterationsParameter.Value; }
-      set { MaximumIterationsParameter.Value = value; }
+    public int MaximumIterations {
+      get { return iterationsTerminator.Threshold.Value; }
+      set { iterationsTerminator.Threshold.Value = value; }
     }
 
@@ -108 +106 @@
       get { return OperatorGraph.Iterate().OfType<AlpsSsGeneticAlgorithmMainLoop>().First(); }
     }
+
+    [Storable]
+    private ComparisonTerminator<IntValue> iterationsTerminator;
 
     [StorableConstructor]
@@ -114 +115 @@
     private AlpsSsGeneticAlgorithm(AlpsSsGeneticAlgorithm original, Cloner cloner)
       : base(original, cloner) {
+      iterationsTerminator = cloner.Clone(original.iterationsTerminator);
       Initialize();
     }
@@ -123 +125 @@
       : base() {
       Parameters.Add(new ValueParameter<IntValue>("LayerSize", "The size of the population of solutions each layer.", new IntValue(100)));
-      Parameters.Add(new ValueParameter<IntValue>("MaximumIterations", "The maximum number of iterations that should be processed.", new IntValue(1000)));
       Parameters.Add(new ConstrainedValueParameter<ISelector>("Selector", "The operator used to select solutions for reproduction."));
       Parameters.Add(new ConstrainedValueParameter<ICrossover>("Crossover", "The operator used to cross solutions."));
@@ -275 +276 @@
           @operator.IterationsParameter.ActualName = "Iteration";
           @operator.IterationsParameter.Hidden = true;
-          @operator.MaximumIterationsParameter.ActualName = MaximumIterationsParameter.Name;
+          @operator.MaximumIterationsParameter.ActualName = iterationsTerminator.ThresholdParameter.Name;
           @operator.MaximumIterationsParameter.Hidden = true;
         }
@@ -307 +308 @@
 
     #region Updates
+    protected override void UpdateTerminators() {
+      var newTerminators = new Dictionary<ITerminator, bool> {
+        {iterationsTerminator, !Terminators.Operators.Contains(iterationsTerminator) || Terminators.Operators.ItemChecked(iterationsTerminator)},
+      };
+
+      base.UpdateTerminators();
+
+      foreach (var newTerminator in newTerminators)
+        Terminators.Operators.Insert(0, newTerminator.Key, newTerminator.Value);
+    }
+    protected override void CreateTerminators() {
+      iterationsTerminator = new ComparisonTerminator<IntValue>("Iterations", ComparisonType.Less, new IntValue(1000)) { Name = "Iterations" };
+      base.CreateTerminators();
+    }
     private void UpdateCrossovers() {
       var oldCrossover = CrossoverParameter.Value;

branches/ALPS/HeuristicLab.Algorithms.ALPS.SteadyState/3.3/AlpsSsGeneticAlgorithmMainLoop.cs

@@ -20 +20 @@
 #endregion
 
-using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -29 +28 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.Selection;
 
 namespace HeuristicLab.Algorithms.ALPS.SteadyState {
@@ -107 +105 @@
       var layerAnalyzer = new Placeholder() { Name = "LayerAnalyzer (Placeholder)" };
       var analyzer = new Placeholder() { Name = "Analyzer (Placeholder)" };
-      var iterationsComparator = new Comparator() { Name = "Iterations >= MaximumIterations" };
-      var terminateBranch = new ConditionalBranch() { Name = "Terminate?" };
+      var termination = new TerminationOperator();
 
 
@@ -253 +250 @@
 
       analyzer.OperatorParameter.ActualName = "Analyzer";
-      analyzer.Successor = iterationsComparator;
-
-      iterationsComparator.Comparison = new Comparison(ComparisonType.GreaterOrEqual);
-      iterationsComparator.LeftSideParameter.ActualName = "Iterations";
-      iterationsComparator.RightSideParameter.ActualName = MaximumIterationsParameter.Name;
-      iterationsComparator.ResultParameter.ActualName = "Terminate";
-      iterationsComparator.Successor = terminateBranch;
-
-      terminateBranch.ConditionParameter.ActualName = "Terminate";
-      terminateBranch.FalseBranch = initializeBatchIteration;
+      analyzer.Successor = termination;
+
+      termination.ContinueBranch = initializeBatchIteration;
     }
   }