Changeset 8349 for branches/RAPGA/HeuristicLab.Algorithms.RAPGA/3.3/RAPGAMainLoop.cs

Timestamp:

07/27/12 16:17:01 (12 years ago)

Author:

jkarder

Message:

#1247: added duplication control

File:

• branches/RAPGA/HeuristicLab.Algorithms.RAPGA/3.3/RAPGAMainLoop.cs (modified) (5 diffs)

branches/RAPGA/HeuristicLab.Algorithms.RAPGA/3.3/RAPGAMainLoop.cs

@@ -151 +151 @@
       ConditionalSelector conditionalSelector = new ConditionalSelector();
       RightReducer rightReducer1 = new RightReducer();
+      UniformSubScopesProcessor uniformSubScopesProcessor3 = new UniformSubScopesProcessor();
+      SubScopesRemover subScopesRemover = new SubScopesRemover();
+      DuplicateSelector duplicateSelector = new DuplicateSelector();
+      LeftReducer leftReducer = new LeftReducer();
       SubScopesCounter subScopesCounter1 = new SubScopesCounter();
       IntCounter intCounter1 = new IntCounter();
-      UniformSubScopesProcessor uniformSubScopesProcessor3 = new UniformSubScopesProcessor();
-      SubScopesRemover subScopesRemover = new SubScopesRemover();
       Comparator comparator2 = new Comparator();
       ConditionalBranch conditionalBranch1 = new ConditionalBranch();
@@ -217 +219 @@
       conditionalSelector.CopySelected.Value = false;
 
+      duplicateSelector.CopySelected.Value = false;
+
+      uniformSubScopesProcessor3.Parallel.Value = true;
+
+      subScopesRemover.RemoveAllSubScopes = true;
+
       subScopesCounter1.Name = "Count Successful Offspring";
       subScopesCounter1.ValueParameter.ActualName = "NumberOfSuccessfulOffspring";
@@ -223 +231 @@
       intCounter1.IncrementParameter.Value = null;
       intCounter1.ValueParameter.ActualName = EvaluatedSolutionsParameter.Name;
-
-      uniformSubScopesProcessor3.Parallel.Value = true;
-
-      subScopesRemover.RemoveAllSubScopes = true;
 
       comparator2.Comparison = new Comparison(ComparisonType.GreaterOrEqual);
@@ -267 +271 @@
       assigner2.RightSideParameter.Value = new IntValue(0);
 
-      subScopesCounter2.Name = "Increment EvaluatedSolutions";
+      subScopesCounter2.Name = "Set CurrentPopulationSize";
       subScopesCounter2.ValueParameter.ActualName = "CurrentPopulationSize";
 
@@ -304 +308 @@
       evaluator.Successor = comparator1;
       conditionalSelector.Successor = rightReducer1;
-      rightReducer1.Successor = subScopesCounter1;
+      rightReducer1.Successor = uniformSubScopesProcessor3;
+      uniformSubScopesProcessor3.Operator = subScopesRemover;
+      uniformSubScopesProcessor3.Successor = duplicateSelector;
+      duplicateSelector.Successor = leftReducer;
+      leftReducer.Successor = subScopesCounter1;
       subScopesCounter1.Successor = intCounter1;
-      intCounter1.Successor = uniformSubScopesProcessor3;
-      uniformSubScopesProcessor3.Operator = subScopesRemover;
-      uniformSubScopesProcessor3.Successor = comparator2;
+      intCounter1.Successor = comparator2;
       comparator2.Successor = conditionalBranch1;
       conditionalBranch1.TrueBranch = bestSelector1;