Changeset 12357

Timestamp:

04/29/15 10:50:08 (10 years ago)

Author:

pfleck

Message:

#2027 Removed obsolete manual termination criteria operators.

File:

• branches/TerminationCriteria/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/OffspringSelectionGeneticAlgorithmMainLoop.cs (modified) (4 diffs)

branches/TerminationCriteria/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/OffspringSelectionGeneticAlgorithmMainLoop.cs

@@ -160 +160 @@
       OffspringSelectionGeneticAlgorithmMainOperator mainOperator = new OffspringSelectionGeneticAlgorithmMainOperator();
       IntCounter generationsCounter = new IntCounter();
-      //Comparator maxGenerationsComparator = new Comparator();
-      //Comparator maxSelectionPressureComparator = new Comparator();
-      //Comparator maxEvaluatedSolutionsComparator = new Comparator();
       Placeholder comparisonFactorModifier = new Placeholder();
       Placeholder analyzer2 = new Placeholder();
       var termination = new TerminationOperator();
-      //ConditionalBranch conditionalBranch1 = new ConditionalBranch();
-      //ConditionalBranch conditionalBranch2 = new ConditionalBranch();
-      //ConditionalBranch conditionalBranch3 = new ConditionalBranch();
 
       variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("Generations", new IntValue(0))); // Class OffspringSelectionGeneticAlgorithm expects this to be called Generations
@@ -210 +204 @@
       generationsCounter.ValueParameter.ActualName = "Generations";
 
-      //maxGenerationsComparator.Comparison = new Comparison(ComparisonType.GreaterOrEqual);
-      //maxGenerationsComparator.LeftSideParameter.ActualName = "Generations";
-      //maxGenerationsComparator.ResultParameter.ActualName = "TerminateMaximumGenerations";
-      //maxGenerationsComparator.RightSideParameter.ActualName = MaximumGenerationsParameter.Name;
-
-      //maxSelectionPressureComparator.Comparison = new Comparison(ComparisonType.GreaterOrEqual);
-      //maxSelectionPressureComparator.LeftSideParameter.ActualName = "SelectionPressure";
-      //maxSelectionPressureComparator.ResultParameter.ActualName = "TerminateSelectionPressure";
-      //maxSelectionPressureComparator.RightSideParameter.ActualName = MaximumSelectionPressureParameter.Name;
-
-      //maxEvaluatedSolutionsComparator.Comparison = new Comparison(ComparisonType.GreaterOrEqual);
-      //maxEvaluatedSolutionsComparator.LeftSideParameter.ActualName = EvaluatedSolutionsParameter.Name;
-      //maxEvaluatedSolutionsComparator.ResultParameter.ActualName = "TerminateEvaluatedSolutions";
-      //maxEvaluatedSolutionsComparator.RightSideParameter.ActualName = "MaximumEvaluatedSolutions";
-
       comparisonFactorModifier.Name = "Update ComparisonFactor (placeholder)";
       comparisonFactorModifier.OperatorParameter.ActualName = ComparisonFactorModifierParameter.Name;
@@ -230 +209 @@
       analyzer2.Name = "Analyzer (placeholder)";
       analyzer2.OperatorParameter.ActualName = AnalyzerParameter.Name;
-
-      //conditionalBranch1.Name = "MaximumSelectionPressure reached?";
-      //conditionalBranch1.ConditionParameter.ActualName = "TerminateSelectionPressure";
-
-      //conditionalBranch2.Name = "MaximumGenerations reached?";
-      //conditionalBranch2.ConditionParameter.ActualName = "TerminateMaximumGenerations";
-
-      //conditionalBranch3.Name = "MaximumEvaluatedSolutions reached?";
-      //conditionalBranch3.ConditionParameter.ActualName = "TerminateEvaluatedSolutions";
       #endregion
 
@@ -248 +218 @@
       resultsCollector1.Successor = mainOperator;
       mainOperator.Successor = generationsCounter;
-      generationsCounter.Successor = comparisonFactorModifier; //maxGenerationsComparator;
-      //maxGenerationsComparator.Successor = maxSelectionPressureComparator;
-      //maxSelectionPressureComparator.Successor = maxEvaluatedSolutionsComparator;
-      //maxEvaluatedSolutionsComparator.Successor = comparisonFactorModifier;
+      generationsCounter.Successor = comparisonFactorModifier;
       comparisonFactorModifier.Successor = analyzer2;
-      analyzer2.Successor = termination; //conditionalBranch1;
-      //conditionalBranch1.FalseBranch = conditionalBranch2;
-      //conditionalBranch1.TrueBranch = null;
-      //conditionalBranch1.Successor = null;
-      //conditionalBranch2.FalseBranch = conditionalBranch3;
-      //conditionalBranch2.TrueBranch = null;
-      //conditionalBranch2.Successor = null;
-      //conditionalBranch3.FalseBranch = mainOperator;
-      //conditionalBranch3.TrueBranch = null;
-      //conditionalBranch3.Successor = null;
+      analyzer2.Successor = termination;
       termination.ContinueBranch = mainOperator;
       #endregion