Changeset 13035

Timestamp:

10/19/15 16:27:05 (9 years ago)

Author:

pfleck

Message:

#2269 Fixed removing unnecessary operators.

File:

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

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

@@ -179 +179 @@
       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";
       numberOfSubScopesBranch.TrueBranch = numberOfSelectedSubScopesPlusCalculator;
@@ -254 +247 @@
         stochasticBranch.RandomParameter.ActualName = "LocalRandom";
 
+      // Remove unused operators
+      var usedOperators = mainLoop.OperatorGraph.Iterate();
+      var unusedOperators = mainLoop.OperatorGraph.Operators.Except(usedOperators);
+      foreach (var op in unusedOperators.ToList())
+        mainLoop.OperatorGraph.Operators.Remove(op);
+
       return mainLoop;
     }