Changeset 13096

Timestamp:

11/02/15 15:59:48 (9 years ago)

Author:

pfleck

Message:

#2269

• Simplified operator graph in MainOperator.
• Added item descriptions.
• Removed unnecessary code.

Location:

branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3

Files:

• AlpsGeneticAlgorithm.cs (modified) (2 diffs)
• AlpsGeneticAlgorithmMainLoop.cs (modified) (2 diffs)
• AlpsGeneticAlgorithmMainOperator.cs (modified) (1 diff)
• LayerCreator.cs (modified) (2 diffs)
• LayerOpener.cs (modified) (1 diff)
• LayerReseeder.cs (modified) (4 diffs)
• WeightingReducer.cs (modified) (1 diff)

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

@@ -215 +215 @@
 
     #region Helper Properties
-    private RandomCreator GlobalRandomCreator {
-      get { return (RandomCreator)OperatorGraph.InitialOperator; }
-    }
     private SolutionsCreator SolutionsCreator {
       get { return OperatorGraph.Iterate().OfType<SolutionsCreator>().First(); }
@@ -619 +616 @@
       int numberOfLayers = NumberOfLayers.Value;
       AgeLimits = scheme.CalculateAgeLimits(ageGap, numberOfLayers);
-      AgeLimits[AgeLimits.Length - 1] = int.MaxValue; // last layer infinite age limit
     }
 

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

@@ -43 +43 @@
       get { return (ScopeTreeLookupParameter<DoubleValue>)Parameters["Quality"]; }
     }
-    public ILookupParameter<IntValue> MaximumGenerationsParameter {
-      get { return (ILookupParameter<IntValue>)Parameters["MaximumGenerations"]; }
-    }
     public ILookupParameter<IOperator> AnalyzerParameter {
       get { return (ILookupParameter<IOperator>)Parameters["Analyzer"]; }
@@ -56 +53 @@
     public GeneticAlgorithmMainLoop MainOperator {
       get { return OperatorGraph.Iterate().OfType<GeneticAlgorithmMainLoop>().First(); }
-    }
-    public EldersEmigrator EldersEmigrator {
-      get { return OperatorGraph.Iterate().OfType<EldersEmigrator>().First(); }
     }
 

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

@@ -40 +40 @@
 
       // Operator starts with calculating number of selected scopes base on plus/comma-selection replacement scheme
-      var numberOfSubScopesBranch = new ConditionalBranch() { Name = "PlusSelection?" };
-      var numberOfSelectedSubScopesPlusCalculator = new ExpressionCalculator() { Name = "NumberOfSelectedSubScopes = PopulationSize * 2" };
-      var numberOfSelectedSubScopesCalculator = new ExpressionCalculator() { Name = "NumberOfSelectedSubScopes = (PopulationSize - Elites) * 2" };
+      var numberOfSelectedSubScopesCalculator = new ExpressionCalculator() { Name = "NumberOfSelectedSubScopes = 2 * (PopulationSize - if PlusSelection then 0 else Elites)" };
       var replacementBranch = new ConditionalBranch() { Name = "PlusSelection?" };
 
       // Set new initial operator
-      mainLoop.OperatorGraph.InitialOperator = numberOfSubScopesBranch;
-
-      numberOfSubScopesBranch.ConditionParameter.ActualName = "PlusSelection";
-      numberOfSubScopesBranch.TrueBranch = numberOfSelectedSubScopesPlusCalculator;
-      numberOfSubScopesBranch.FalseBranch = numberOfSelectedSubScopesCalculator;
-      numberOfSubScopesBranch.Successor = selector;
-
-      numberOfSelectedSubScopesPlusCalculator.CollectedValues.Add(new LookupParameter<IntValue>("PopulationSize"));
-      numberOfSelectedSubScopesPlusCalculator.ExpressionResultParameter.ActualName = "NumberOfSelectedSubScopes";
-      numberOfSelectedSubScopesPlusCalculator.ExpressionParameter.Value = new StringValue("PopulationSize 2 * toint");
+      mainLoop.OperatorGraph.InitialOperator = numberOfSelectedSubScopesCalculator;
 
       numberOfSelectedSubScopesCalculator.CollectedValues.Add(new LookupParameter<IntValue>("PopulationSize"));
       numberOfSelectedSubScopesCalculator.CollectedValues.Add(new LookupParameter<IntValue>("Elites"));
+      numberOfSelectedSubScopesCalculator.CollectedValues.Add(new LookupParameter<BoolValue>("PlusSelection"));
       numberOfSelectedSubScopesCalculator.ExpressionResultParameter.ActualName = "NumberOfSelectedSubScopes";
-      numberOfSelectedSubScopesCalculator.ExpressionParameter.Value = new StringValue("PopulationSize Elites - 2 * toint");
+      numberOfSelectedSubScopesCalculator.ExpressionParameter.Value = new StringValue("PopulationSize 0 Elites PlusSelection if - 2 * toint");
+      numberOfSelectedSubScopesCalculator.Successor = selector;
 
       // Use Elitism or Plus-Selection as replacement strategy

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

@@ -32 +32 @@
 
 namespace HeuristicLab.Algorithms.ALPS {
-  [Item("LayerCreator", "An operator which creates a new layer by cloning the oldest one and setting the variables accordingly.")]
+  [Item("LayerCreator", "An operator which creates a new layer by cloning the current oldest one.")]
   [StorableClass]
   public sealed class LayerCreator : SingleSuccessorOperator {
@@ -106 +106 @@
       }
     }
-
   }
 }

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

@@ -30 +30 @@
 
 namespace HeuristicLab.Algorithms.ALPS {
-  [Item("LayerOpener", "")]
+  [Item("LayerOpener", "An operator that encapsules opening new layer for ALPS when required.")]
   [StorableClass]
   public sealed class LayerOpener : AlgorithmOperator {

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

@@ -31 +31 @@
 
 namespace HeuristicLab.Algorithms.ALPS {
-  [Item("LayerReseeder", "")]
+  [Item("LayerReseeder", "An operator that encapsulates the reseeding of the lowest layer in ALPS.")]
   [StorableClass]
   public sealed class LayerReseeder : SingleSuccessorOperator, IOperatorGraphOperator {
@@ -81 +81 @@
 
       var subScopesCounter = new SubScopesCounter();
-      //var continuousReseedingBranch = new ConditionalBranch() { Name = "ContinuousReseeding?" };
-      //var reseedingIntervalCalculator = new ExpressionCalculator() { Name = "DoReseeding = Generation % AgeGap == 0" };
-      //var doReseedingBranch = new ConditionalBranch() { Name = "DoReseeding?" };
       var numberOfReplacedCalculator = new ExpressionCalculator() { Name = "NumberOfReplaced = if ContinuousReseeding then max(LayerPopulationSize - (PopulationSize - PopulationSize / AgeGap), 0) else PopulationSize" };
       var numberOfNewIndividualsCalculator = new ExpressionCalculator() { Name = "NumberOfNewIndividuals = PopulationSize - (LayerPopulatioSize - NumberOfReplaced)" };
@@ -96 +93 @@
       var subScopesCounter2 = new SubScopesCounter();
 
-      //OperatorGraph.InitialOperator = continuousReseedingBranch;
       OperatorGraph.InitialOperator = subScopesCounter;
 
@@ -102 +98 @@
       subScopesCounter.AccumulateParameter.Value = new BoolValue(false);
       subScopesCounter.Successor = numberOfReplacedCalculator;
-
-      //continuousReseedingBranch.ConditionParameter.ActualName = "ContinuousReseeding";
-      //continuousReseedingBranch.TrueBranch = numberOfChildrenCalculator;
-      //continuousReseedingBranch.FalseBranch = reseedingIntervalCalculator;
-
-      //reseedingIntervalCalculator.CollectedValues.Add(new LookupParameter<IntValue>("Generation"));
-      //reseedingIntervalCalculator.CollectedValues.Add(new LookupParameter<IntValue>("AgeGap"));
-      //reseedingIntervalCalculator.ExpressionResultParameter.ActualName = "DoReseeding";
-      //reseedingIntervalCalculator.ExpressionParameter.Value = new StringValue("Generation AgeGap % 0 ==");
-      //reseedingIntervalCalculator.Successor = doReseedingBranch;
-
-      //doReseedingBranch.ConditionParameter.ActualName = "DoReseeding";
-      //doReseedingBranch.TrueBranch = numberOfChildrenCalculator;
 
       numberOfReplacedCalculator.CollectedValues.Add(new LookupParameter<BoolValue>("ContinuousReseeding"));

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

@@ -77 +77 @@
       return base.Apply();
     }
-
   }
 }