Changeset 11586 for branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3/AlpsGeneticAlgorithmMainLoop.cs

Timestamp:

11/26/14 11:06:38 (9 years ago)

Author:

pfleck

Message:

#2269 Implemented LayerUpdator.

• Added First/LastSubScopeProcessor.
• Added two Calculators because ExpressionCalculator does not support required features yet.
• Added some wiring.
• Small bugfixes and refactorings.

File:

• branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3/AlpsGeneticAlgorithmMainLoop.cs (modified) (7 diffs)

branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3/AlpsGeneticAlgorithmMainLoop.cs

@@ -38 +38 @@
   public sealed class AlpsGeneticAlgorithmMainLoop : AlgorithmOperator {
     #region Parameter Properties
-    public ILookupParameter<IRandom> RandomParameter {
-      get { return (ILookupParameter<IRandom>)Parameters["Random"]; }
-    }
-    /*public ILookupParameter<BoolValue> MaximizationParameter {
-      get { return (ILookupParameter<BoolValue>)Parameters["Maximization"]; }
-    }
-    public IScopeTreeLookupParameter<DoubleValue> QualityParameter {
-      get { return (IScopeTreeLookupParameter<DoubleValue>)Parameters["Quality"]; }
-    }
-    public ILookupParameter<DoubleValue> BestKnownQualityParameter {
-      get { return (ILookupParameter<DoubleValue>)Parameters["BestKnownQuality"]; }
-    }
-    public ILookupParameter<IOperator> EvaluatorParameter {
-      get { return (ILookupParameter<IOperator>)Parameters["Evaluator"]; }
-    }*/
-    public ILookupParameter<IntValue> PopulationSizeParameter {
-      get { return (ILookupParameter<IntValue>)Parameters["PopulationSize"]; }
-    }
     public ILookupParameter<IntValue> MaximumGenerationsParameter {
       get { return (ILookupParameter<IntValue>)Parameters["MaximumGenerations"]; }
-    }
-    public ILookupParameter<IOperator> SelectorParameter {
-      get { return (ILookupParameter<IOperator>)Parameters["Selector"]; }
-    }
-    public ILookupParameter<IOperator> CrossoverParameter {
-      get { return (ILookupParameter<IOperator>)Parameters["Crossover"]; }
-    }
-    public ILookupParameter<PercentValue> MutationProbabilityParameter {
-      get { return (ILookupParameter<PercentValue>)Parameters["MutationProbability"]; }
-    }
-    public ILookupParameter<IOperator> MutatorParameter {
-      get { return (ILookupParameter<IOperator>)Parameters["Mutator"]; }
-    }
-    public ILookupParameter<IntValue> ElitesParameter {
-      get { return (ILookupParameter<IntValue>)Parameters["Elites"]; }
-    }
-    public IValueLookupParameter<BoolValue> ReevaluateElitesParameter {
-      get { return (IValueLookupParameter<BoolValue>)Parameters["ReevaluateElites"]; }
-    }
-    public ILookupParameter<ResultCollection> ResultsParameter {
-      get { return (ILookupParameter<ResultCollection>)Parameters["Results"]; }
     }
     public ILookupParameter<IOperator> AnalyzerParameter {
@@ -91 +52 @@
       get { return OperatorGraph.Iterate().OfType<GeneticAlgorithmMainLoop>().First(); }
     }
+    public EldersEmigrator EldersEmigrator {
+      get { return OperatorGraph.Iterate().OfType<EldersEmigrator>().First(); }
+    }
 
     [StorableConstructor]
@@ -102 +66 @@
     public AlpsGeneticAlgorithmMainLoop()
       : base() {
-      Parameters.Add(new LookupParameter<IRandom>("Random", "A pseudo random number generator."));
-      /*Parameters.Add(new LookupParameter<BoolValue>("Maximization", "True if the problem is a maximization problem, otherwise false."));
-      Parameters.Add(new ScopeTreeLookupParameter<DoubleValue>("Quality", "The value which represents the quality of a solution."));
-      Parameters.Add(new LookupParameter<DoubleValue>("BestKnownQuality", "The best known quality value found so far."));
-      Parameters.Add(new LookupParameter<IOperator>("Evaluator", "The operator used to evaluate solutions."));*/
-      Parameters.Add(new LookupParameter<IntValue>("PopulationSize", "The size of the population of solutions."));
       Parameters.Add(new LookupParameter<IntValue>("MaximumGenerations", "The maximum number of generations that the algorithm should process."));
-      Parameters.Add(new LookupParameter<IOperator>("Selector", "The operator used to select solutions for reproduction."));
-      Parameters.Add(new LookupParameter<IOperator>("Crossover", "The operator used to cross solutions."));
-      Parameters.Add(new LookupParameter<PercentValue>("MutationProbability", "The probability that the mutation operator is applied on a solution."));
-      Parameters.Add(new LookupParameter<IOperator>("Mutator", "The operator used to mutate solutions."));
-      Parameters.Add(new LookupParameter<IntValue>("Elites", "The numer of elite solutions which are kept in each generation."));
-      Parameters.Add(new LookupParameter<BoolValue>("ReevaluateElites", "Flag to determine if elite individuals should be reevaluated (i.e., if stochastic fitness functions are used.)"));
-      Parameters.Add(new LookupParameter<ResultCollection>("Results", "The results collection to store the results."));
       Parameters.Add(new LookupParameter<IOperator>("Analyzer", "The operator used to the analyze all individuals."));
       Parameters.Add(new LookupParameter<IOperator>("LayerAnalyzer", "The operator used to analyze each layer."));
@@ -126 +77 @@
       var matingPoolCreator = new MatingPoolCreator() { Name = "Create Mating Pools" };
       var matingPoolProcessor = new UniformSubScopesProcessor();
-      var mainOperator = PrepareGeneticAlgorithmMainLoop();
+      var mainOperator = CreatePreparedGeneticAlgorithmMainLoop();
       var layerAnalyzerPlaceholder = new Placeholder() { Name = "LayerAnalyzer (Placeholder)" };
       var generationsIcrementor = new IntCounter() { Name = "Increment Generations" };
       var evaluatedSolutionsReducer = new DataReducer() { Name = "Increment EvaluatedSolutions" };
       var eldersEmigrator = new EldersEmigrator() { Name = "Emigrate Elders" };
-      var layerUpdator = new CombinedOperator() { Name = "Update Layers" };
+      var layerUpdator = new LayerUpdator(mainOperator) { Name = "Update Layers" };
       var analyzerPlaceholder = new Placeholder() { Name = "Analyzer (Placeholder)" };
       var generationsComparator = new Comparator() { Name = "Generations >= MaximumGenerations" };
@@ -140 +91 @@
       variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("Generations", new IntValue(0)));
       variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("GenerationsSinceLastRefresh", new IntValue(0)));
+      variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("OpenLayers", new IntValue(1)));
       variableCreator.Successor = resultsCollector;
 
@@ -193 +145 @@
     }
 
-    private GeneticAlgorithmMainLoop PrepareGeneticAlgorithmMainLoop() {
+    private GeneticAlgorithmMainLoop CreatePreparedGeneticAlgorithmMainLoop() {
       var mainLoop = new GeneticAlgorithmMainLoop();
       var selector = mainLoop.OperatorGraph.Iterate().OfType<Placeholder>().First(o => o.OperatorParameter.ActualName == "Selector");
@@ -228 +180 @@
         stochasticBranch.RandomParameter.ActualName = "LocalRandom";
 
-      // Remove unnessesary subtrees
-      //foreach (var @operator in mainLoop.OperatorGraph.Operators.OfType<SingleSuccessorOperator>().Where(o => o.Successor == selector))
-      //  @operator.Successor = null;
-
       return mainLoop;
     }