Changeset 13096 for branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3/LayerReseeder.cs

Timestamp:

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

Author:

pfleck

Message:

#2269

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

File:

• branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3/LayerReseeder.cs (modified) (4 diffs)

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