Changeset 12998 for branches

Timestamp:

10/13/15 09:57:42 (9 years ago)

Author:

pfleck

Message:

#2269

• Removed unused operators in modified GA mainloop.
• Unhide PlusSelection parameter.

Location:

branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3

Files:

• AlpsGeneticAlgorithm.cs (modified) (1 diff)
• AlpsGeneticAlgorithmMainLoop.cs (modified) (2 diffs)

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

@@ -295 +295 @@
       Parameters.Add(new ValueParameter<IntValue>("Elites", "The numer of elite solutions which are kept in each generation.", new IntValue(1)));
       Parameters.Add(new FixedValueParameter<BoolValue>("ReevaluateElites", "Flag to determine if elite individuals should be reevaluated (i.e., if stochastic fitness functions are used.)", new BoolValue(false)) { Hidden = true });
-      Parameters.Add(new ValueParameter<BoolValue>("PlusSelection", "Include the parents in the selection of the invividuals for the next generation.", new BoolValue(false)) { Hidden = true });
+      Parameters.Add(new ValueParameter<BoolValue>("PlusSelection", "Include the parents in the selection of the invividuals for the next generation.", new BoolValue(false)));
 
       Parameters.Add(new ValueParameter<EnumValue<AgingScheme>>("AgingScheme", "The aging scheme for setting the age-limits for the layers.", new EnumValue<AgingScheme>(ALPS.AgingScheme.Polynomial)));

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

@@ -172 +172 @@
       var mainLoop = new GeneticAlgorithmMainLoop();
 
+      var oldInitialOp = mainLoop.OperatorGraph.InitialOperator;
       var selector = mainLoop.OperatorGraph.Iterate().OfType<Placeholder>().First(o => o.OperatorParameter.ActualName == "Selector");
       var crossover = mainLoop.OperatorGraph.Iterate().OfType<Placeholder>().First(o => o.OperatorParameter.ActualName == "Crossover");
@@ -183 +184 @@
       var replacementBranch = new ConditionalBranch() { Name = "PlusSelection?" };
 
+      // Set new initial operator
       mainLoop.OperatorGraph.InitialOperator = numberOfSubScopesBranch;
+
+      // Remove unused operators
+      while (oldInitialOp != selector) {
+        mainLoop.OperatorGraph.Operators.Remove(oldInitialOp);
+        var op = oldInitialOp as SingleSuccessorOperator;
+        oldInitialOp = op != null ? op.Successor : null;
+      }
 
       numberOfSubScopesBranch.ConditionParameter.ActualName = "PlusSelection";