Changeset 14353 for trunk/sources/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm

Timestamp:

10/23/16 19:31:18 (8 years ago)

Author:

bburlacu

Message:

#2685: Add correction step for values miscalculated due to cyclical symbol dependencies in the grammar. Updated unit test.

File:

• trunk/sources/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/OffspringSelectionGeneticAlgorithmMainLoop.cs (modified) (6 diffs)

trunk/sources/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/OffspringSelectionGeneticAlgorithmMainLoop.cs

@@ -162 +162 @@
       Comparator maxSelectionPressureComparator = new Comparator();
       Comparator maxEvaluatedSolutionsComparator = new Comparator();
+      Comparator maxSolutionQualityComparator = new Comparator();
       Placeholder comparisonFactorModifier = new Placeholder();
       Placeholder analyzer2 = new Placeholder();
@@ -167 +168 @@
       ConditionalBranch conditionalBranch2 = new ConditionalBranch();
       ConditionalBranch conditionalBranch3 = new ConditionalBranch();
+      ConditionalBranch conditionalBranch4 = new ConditionalBranch();
 
       variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("Generations", new IntValue(0))); // Class OffspringSelectionGeneticAlgorithm expects this to be called Generations
@@ -223 +225 @@
       maxEvaluatedSolutionsComparator.RightSideParameter.ActualName = "MaximumEvaluatedSolutions";
 
+      maxSolutionQualityComparator.Comparison = new Comparison(ComparisonType.GreaterOrEqual);
+      maxSolutionQualityComparator.LeftSideParameter.ActualName = "MaximumQuality";
+      maxSolutionQualityComparator.ResultParameter.ActualName = "TerminateMaximumQuality";
+      maxSolutionQualityComparator.RightSideParameter.ActualName = "BestQuality";
+
       comparisonFactorModifier.Name = "Update ComparisonFactor (placeholder)";
       comparisonFactorModifier.OperatorParameter.ActualName = ComparisonFactorModifierParameter.Name;
@@ -237 +244 @@
       conditionalBranch3.Name = "MaximumEvaluatedSolutions reached?";
       conditionalBranch3.ConditionParameter.ActualName = "TerminateEvaluatedSolutions";
+
+      conditionalBranch4.Name = "MaximumQuality reached?";
+      conditionalBranch3.ConditionParameter.ActualName = "TerminateMaximumQuality";
       #endregion
 
@@ -249 +259 @@
       maxGenerationsComparator.Successor = maxSelectionPressureComparator;
       maxSelectionPressureComparator.Successor = maxEvaluatedSolutionsComparator;
-      maxEvaluatedSolutionsComparator.Successor = comparisonFactorModifier;
+      maxEvaluatedSolutionsComparator.Successor = maxSolutionQualityComparator;
+      maxSolutionQualityComparator.Successor = comparisonFactorModifier;
       comparisonFactorModifier.Successor = analyzer2;
       analyzer2.Successor = conditionalBranch1;
@@ -258 +269 @@
       conditionalBranch2.TrueBranch = null;
       conditionalBranch2.Successor = null;
-      conditionalBranch3.FalseBranch = mainOperator;
+      conditionalBranch3.FalseBranch = conditionalBranch4;
       conditionalBranch3.TrueBranch = null;
       conditionalBranch3.Successor = null;
+      conditionalBranch4.FalseBranch = mainOperator;
+      conditionalBranch4.TrueBranch = null;
+      conditionalBranch4.Successor = null;
       #endregion
     }