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

Timestamp:

09/10/12 17:10:27 (12 years ago)

Author:

jkarder

Message:

#1247:

• fixed some bugs
• minor code improvements

File:

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

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

@@ -166 +166 @@
       ProgressiveOffspringPreserver progressiveOffspringSelector = new ProgressiveOffspringPreserver();
       SubScopesCounter subScopesCounter2 = new SubScopesCounter();
+      Calculator calculator1 = new Calculator();
+      ConditionalBranch conditionalBranch1 = new ConditionalBranch();
       Comparator comparator1 = new Comparator();
-      ConditionalBranch conditionalBranch1 = new ConditionalBranch();
-      Comparator comparator2 = new Comparator();
       ConditionalBranch conditionalBranch2 = new ConditionalBranch();
       LeftReducer leftReducer2 = new LeftReducer();
@@ -175 +175 @@
       RightReducer rightReducer2 = new RightReducer();
       ScopeCleaner scopeCleaner = new ScopeCleaner();
-      OffspringRestorer offspringRestorer = new OffspringRestorer();
+      ScopeRestorer scopeRestorer = new ScopeRestorer();
       MergingReducer mergingReducer = new MergingReducer();
-      Assigner assigner2 = new Assigner();
       IntCounter intCounter3 = new IntCounter();
       SubScopesCounter subScopesCounter3 = new SubScopesCounter();
-      ExpressionEvaluator expressionEvaluator = new ExpressionEvaluator();
+      Calculator calculator2 = new Calculator();
+      Comparator comparator2 = new Comparator();
+      ConditionalBranch conditionalBranch3 = new ConditionalBranch();
       Placeholder analyzer2 = new Placeholder();
       Comparator comparator3 = new Comparator();
-      ConditionalBranch conditionalBranch3 = new ConditionalBranch();
+      ConditionalBranch conditionalBranch4 = new ConditionalBranch();
       Comparator comparator4 = new Comparator();
-      ConditionalBranch conditionalBranch4 = new ConditionalBranch();
+      ConditionalBranch conditionalBranch5 = new ConditionalBranch();
       Assigner assigner3 = new Assigner();
       Assigner assigner4 = new Assigner();
@@ -192 +193 @@
       variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("Generations", new IntValue(0))); // Class RAPGA expects this to be called Generations
       variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("CurrentPopulationSize", new IntValue(0)));
-      variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("LastPopulationSize", new IntValue(0)));
       variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("NumberOfCreatedOffspring", new IntValue(0)));
       variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("NumberOfSuccessfulOffspring", new IntValue(0)));
@@ -258 +258 @@
       subScopesCounter2.ValueParameter.ActualName = "NumberOfSuccessfulOffspring";
 
-      comparator1.Name = "NumberOfSuccessfulOffspring >= MaximumPopulationSize";
-      comparator1.Comparison = new Comparison(ComparisonType.GreaterOrEqual);
-      comparator1.LeftSideParameter.ActualName = "NumberOfSuccessfulOffspring";
-      comparator1.RightSideParameter.ActualName = MaximumPopulationSizeParameter.Name;
-      comparator1.ResultParameter.ActualName = "Break";
+      calculator1.Name = "NumberOfSuccessfulOffspring == MaximumPopulationSize - Elites";
+      calculator1.CollectedValues.Add(new ValueLookupParameter<IntValue>("NumberOfSuccessfulOffspring"));
+      calculator1.CollectedValues.Add(new ValueLookupParameter<IntValue>("MaximumPopulationSize"));
+      calculator1.CollectedValues.Add(new ValueLookupParameter<IntValue>("Elites"));
+      calculator1.ExpressionParameter.Value = new StringValue("NumberOfSuccessfulOffspring MaximumPopulationSize Elites - ==");
+      calculator1.ExpressionResultParameter.ActualName = "Break";
 
       conditionalBranch1.Name = "Break?";
       conditionalBranch1.ConditionParameter.ActualName = "Break";
 
-      comparator2.Name = "NumberOfCreatedOffspring >= Effort";
-      comparator2.Comparison = new Comparison(ComparisonType.GreaterOrEqual);
-      comparator2.LeftSideParameter.ActualName = "NumberOfCreatedOffspring";
-      comparator2.RightSideParameter.ActualName = EffortParameter.Name;
-      comparator2.ResultParameter.ActualName = "Break";
+      comparator1.Name = "NumberOfCreatedOffspring >= Effort";
+      comparator1.Comparison = new Comparison(ComparisonType.GreaterOrEqual);
+      comparator1.LeftSideParameter.ActualName = "NumberOfCreatedOffspring";
+      comparator1.RightSideParameter.ActualName = EffortParameter.Name;
+      comparator1.ResultParameter.ActualName = "Break";
 
       conditionalBranch2.Name = "Break?";
@@ -281 +282 @@
       bestSelector.QualityParameter.ActualName = QualityParameter.Name;
 
-      assigner2.Name = "Update LastPopulationSize";
-      assigner2.LeftSideParameter.ActualName = "LastPopulationSize";
-      assigner2.RightSideParameter.ActualName = "CurrentPopulationSize";
-
       intCounter3.Name = "Increment Generations";
       intCounter3.Increment = new IntValue(1);
@@ -293 +290 @@
       subScopesCounter3.AccumulateParameter.Value = new BoolValue(false);
 
-      expressionEvaluator.Name = "Evaluate ActualSelectionPressure";
-      expressionEvaluator.CollectedValues.Add(new ValueLookupParameter<IntValue>("CurrentPopulationSize"));
-      expressionEvaluator.CollectedValues.Add(new ValueLookupParameter<IntValue>("LastPopulationSize"));
-      expressionEvaluator.CollectedValues.Add(new ValueLookupParameter<IntValue>("NumberOfCreatedOffspring"));
-      expressionEvaluator.CollectedValues.Add(new ValueLookupParameter<IntValue>("NumberOfSuccessfulOffspring"));
-      expressionEvaluator.ExpressionParameter.Value = new StringValue("CurrentPopulationSize NumberOfCreatedOffspring NumberOfSuccessfulOffspring - + LastPopulationSize /");
-      expressionEvaluator.ExpressionResultParameter.ActualName = "ActualSelectionPressure";
+      calculator2.Name = "Evaluate ActualSelectionPressure";
+      calculator2.CollectedValues.Add(new ValueLookupParameter<IntValue>("NumberOfCreatedOffspring"));
+      calculator2.CollectedValues.Add(new ValueLookupParameter<IntValue>("Elites"));
+      calculator2.CollectedValues.Add(new ValueLookupParameter<IntValue>("CurrentPopulationSize"));
+      calculator2.ExpressionParameter.Value = new StringValue("NumberOfCreatedOffspring Elites + CurrentPopulationSize /");
+      calculator2.ExpressionResultParameter.ActualName = "ActualSelectionPressure";
+
+      comparator2.Name = "CurrentPopulationSize < 1";
+      comparator2.Comparison = new Comparison(ComparisonType.Less);
+      comparator2.LeftSideParameter.ActualName = "CurrentPopulationSize";
+      comparator2.RightSideParameter.Value = new IntValue(1);
+      comparator2.ResultParameter.ActualName = "Terminate";
+
+      conditionalBranch3.Name = "Terminate?";
+      conditionalBranch3.ConditionParameter.ActualName = "Terminate";
 
       analyzer2.Name = "Analyzer";
@@ -310 +315 @@
       comparator3.RightSideParameter.ActualName = MaximumGenerationsParameter.Name;
 
-      conditionalBranch3.Name = "Terminate?";
-      conditionalBranch3.ConditionParameter.ActualName = "Terminate";
+      conditionalBranch4.Name = "Terminate?";
+      conditionalBranch4.ConditionParameter.ActualName = "Terminate";
 
       comparator4.Name = "CurrentPopulationSize < MinimumPopulationSize";
@@ -319 +324 @@
       comparator4.ResultParameter.ActualName = "Terminate";
 
-      conditionalBranch4.Name = "Terminate?";
-      conditionalBranch4.ConditionParameter.ActualName = "Terminate";
+      conditionalBranch5.Name = "Terminate?";
+      conditionalBranch5.ConditionParameter.ActualName = "Terminate";
 
       assigner3.Name = "Reset NumberOfCreatedOffspring";
@@ -344 +349 @@
       subScopesProcessor1.Operators.Add(new EmptyOperator());
       subScopesProcessor1.Operators.Add(childrenCreator);
-      subScopesProcessor1.Successor = comparator1;
+      subScopesProcessor1.Successor = calculator1;
       childrenCreator.Successor = uniformSubScopesProcessor;
       uniformSubScopesProcessor.Operator = crossover;
@@ -362 +367 @@
       leftReducer1.Successor = progressiveOffspringSelector;
       progressiveOffspringSelector.Successor = subScopesCounter2;
-      comparator1.Successor = conditionalBranch1;
-      conditionalBranch1.FalseBranch = comparator2;
+      calculator1.Successor = conditionalBranch1;
+      conditionalBranch1.FalseBranch = comparator1;
       conditionalBranch1.TrueBranch = subScopesProcessor2;
-      comparator2.Successor = conditionalBranch2;
+      comparator1.Successor = conditionalBranch2;
       conditionalBranch2.FalseBranch = leftReducer2;
       conditionalBranch2.TrueBranch = subScopesProcessor2;
@@ -374 +379 @@
       bestSelector.Successor = rightReducer2;
       rightReducer2.Successor = null;
-      scopeCleaner.Successor = offspringRestorer;
-      mergingReducer.Successor = assigner2;
-      assigner2.Successor = intCounter3;
+      scopeCleaner.Successor = scopeRestorer;
+      mergingReducer.Successor = intCounter3;
       intCounter3.Successor = subScopesCounter3;
-      subScopesCounter3.Successor = expressionEvaluator;
-      expressionEvaluator.Successor = analyzer2;
+      subScopesCounter3.Successor = calculator2;
+      calculator2.Successor = comparator2;
+      comparator2.Successor = conditionalBranch3;
+      conditionalBranch3.FalseBranch = analyzer2;
+      conditionalBranch3.TrueBranch = null;
       analyzer2.Successor = comparator3;
-      comparator3.Successor = conditionalBranch3;
-      conditionalBranch3.FalseBranch = comparator4;
-      conditionalBranch3.TrueBranch = null;
-      conditionalBranch3.Successor = null;
-      comparator4.Successor = conditionalBranch4;
-      conditionalBranch4.FalseBranch = assigner3;
+      comparator3.Successor = conditionalBranch4;
+      conditionalBranch4.FalseBranch = comparator4;
       conditionalBranch4.TrueBranch = null;
       conditionalBranch4.Successor = null;
+      comparator4.Successor = conditionalBranch5;
+      conditionalBranch5.FalseBranch = assigner3;
+      conditionalBranch5.TrueBranch = null;
+      conditionalBranch5.Successor = null;
       assigner3.Successor = assigner4;
       assigner4.Successor = assigner5;