Changeset 8385 for branches/RAPGA

Timestamp:

08/02/12 13:22:47 (12 years ago)

Author:

jkarder

Message:

#1247:

• added operator that evaluates expressions
• added selection pressure analyzer
• fixed bug in counting of evaluated solutions

Location:

branches/RAPGA/HeuristicLab.Algorithms.RAPGA/3.3

Files:

• Analyzers/SelectionPressureAnalyzer.cs (added)
• ExpressionEvaluator.cs (added)
• HeuristicLab.Algorithms.RAPGA-3.3.csproj (modified) (1 diff)
• RAPGA.cs (modified) (5 diffs)
• RAPGAMainLoop.cs (modified) (10 diffs)

branches/RAPGA/HeuristicLab.Algorithms.RAPGA/3.3/HeuristicLab.Algorithms.RAPGA-3.3.csproj

@@ -97 +97 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Analyzers\SelectionPressureAnalyzer.cs" />
     <Compile Include="Analyzers\OffspringSuccessAnalyzer.cs" />
     <Compile Include="Analyzers\PopulationSizeAnalyzer.cs" />
     <Compile Include="DuplicatesSelector.cs" />
+    <Compile Include="ExpressionEvaluator.cs" />
     <Compile Include="OffspringRestorer.cs" />
     <Compile Include="ProgressiveOffspringPreserver.cs" />

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

@@ -185 +185 @@
     [Storable]
     private OffspringSuccessAnalyzer offspringSuccessAnalyzer;
+    [Storable]
+    private SelectionPressureAnalyzer selectionPressureAnalyzer;
     #endregion
 
@@ -196 +198 @@
       populationSizeAnalyzer = cloner.Clone(original.populationSizeAnalyzer);
       offspringSuccessAnalyzer = cloner.Clone(original.offspringSuccessAnalyzer);
+      selectionPressureAnalyzer = cloner.Clone(original.selectionPressureAnalyzer);
       Initialize();
     }
@@ -263 +266 @@
       populationSizeAnalyzer = new PopulationSizeAnalyzer();
       offspringSuccessAnalyzer = new OffspringSuccessAnalyzer();
+      selectionPressureAnalyzer = new SelectionPressureAnalyzer();
       ParameterizeAnalyzers();
       UpdateAnalyzers();
@@ -401 +405 @@
       offspringSuccessAnalyzer.ResultsParameter.ActualName = "Results";
       offspringSuccessAnalyzer.ResultsParameter.Hidden = true;
+      selectionPressureAnalyzer.ResultsParameter.ActualName = "Results";
+      selectionPressureAnalyzer.ResultsParameter.Hidden = true;
       if (Problem != null) {
         qualityAnalyzer.MaximizationParameter.ActualName = Problem.MaximizationParameter.Name;
@@ -459 +465 @@
       Analyzer.Operators.Add(populationSizeAnalyzer, populationSizeAnalyzer.EnabledByDefault);
       Analyzer.Operators.Add(offspringSuccessAnalyzer, offspringSuccessAnalyzer.EnabledByDefault);
+      Analyzer.Operators.Add(selectionPressureAnalyzer, selectionPressureAnalyzer.EnabledByDefault);
     }
     private void UpdateSimilarityCalculators() {

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

@@ -158 +158 @@
       WeightedParentsQualityComparator weightedParentsQualityComparator = new WeightedParentsQualityComparator();
       SubScopesRemover subScopesRemover = new SubScopesRemover();
-      SubScopesCounter subScopesCounter1 = new SubScopesCounter();
       IntCounter intCounter1 = new IntCounter();
+      IntCounter intCounter2 = new IntCounter();
       ConditionalSelector conditionalSelector = new ConditionalSelector();
       RightReducer rightReducer1 = new RightReducer();
@@ -177 +177 @@
       OffspringRestorer offspringRestorer = new OffspringRestorer();
       MergingReducer mergingReducer = new MergingReducer();
-      IntCounter intCounter2 = new IntCounter();
+      Assigner assigner2 = new Assigner();
+      IntCounter intCounter3 = new IntCounter();
       SubScopesCounter subScopesCounter3 = new SubScopesCounter();
+      ExpressionEvaluator expressionEvaluator = new ExpressionEvaluator();
+      Placeholder analyzer2 = new Placeholder();
       Comparator comparator3 = new Comparator();
-      Placeholder analyzer2 = new Placeholder();
       ConditionalBranch conditionalBranch3 = new ConditionalBranch();
       Comparator comparator4 = new Comparator();
       ConditionalBranch conditionalBranch4 = new ConditionalBranch();
-      Assigner assigner2 = new Assigner();
       Assigner assigner3 = new Assigner();
       Assigner assigner4 = new Assigner();
+      Assigner assigner5 = new Assigner();
 
       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)));
@@ -232 +235 @@
       subScopesRemover.RemoveAllSubScopes = true;
 
-      subScopesCounter1.Name = "Increment NumberOfCreatedOffspring";
-      subScopesCounter1.ValueParameter.ActualName = "NumberOfCreatedOffspring";
-
-      intCounter1.Name = "Increment EvaluatedSolutions";
-      intCounter1.ValueParameter.ActualName = EvaluatedSolutionsParameter.Name;
+      intCounter1.Name = "Increment NumberOfCreatedOffspring";
+      intCounter1.ValueParameter.ActualName = "NumberOfCreatedOffspring";
       intCounter1.Increment = null;
-      intCounter1.IncrementParameter.ActualName = "NumberOfCreatedOffspring";
+      intCounter1.IncrementParameter.ActualName = BatchSizeParameter.Name;
+
+      intCounter2.Name = "Increment EvaluatedSolutions";
+      intCounter2.ValueParameter.ActualName = EvaluatedSolutionsParameter.Name;
+      intCounter2.Increment = null;
+      intCounter2.IncrementParameter.ActualName = BatchSizeParameter.Name;
 
       conditionalSelector.ConditionParameter.ActualName = "SuccessfulOffspring";
@@ -276 +281 @@
       bestSelector.QualityParameter.ActualName = QualityParameter.Name;
 
-      intCounter2.Name = "Increment Generations";
-      intCounter2.Increment = new IntValue(1);
-      intCounter2.ValueParameter.ActualName = "Generations";
-      subScopesCounter3.Name = "Set CurrentPopulationSize";
-
+      assigner2.Name = "Update LastPopulationSize";
+      assigner2.LeftSideParameter.ActualName = "LastPopulationSize";
+      assigner2.RightSideParameter.ActualName = "CurrentPopulationSize";
+
+      intCounter3.Name = "Increment Generations";
+      intCounter3.Increment = new IntValue(1);
+      intCounter3.ValueParameter.ActualName = "Generations";
+
+      subScopesCounter3.Name = "Update CurrentPopulationSize";
       subScopesCounter3.ValueParameter.ActualName = "CurrentPopulationSize";
       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";
+
+      analyzer2.Name = "Analyzer";
+      analyzer2.OperatorParameter.ActualName = "Analyzer";
 
       comparator3.Name = "Generations >= MaximumGenerations";
@@ -290 +310 @@
       comparator3.RightSideParameter.ActualName = MaximumGenerationsParameter.Name;
 
-      analyzer2.Name = "Analyzer";
-      analyzer2.OperatorParameter.ActualName = "Analyzer";
-
       conditionalBranch3.Name = "Terminate?";
       conditionalBranch3.ConditionParameter.ActualName = "Terminate";
@@ -305 +322 @@
       conditionalBranch4.ConditionParameter.ActualName = "Terminate";
 
-      assigner2.Name = "Reset NumberOfCreatedOffspring";
-      assigner2.LeftSideParameter.ActualName = "NumberOfCreatedOffspring";
-      assigner2.RightSideParameter.Value = new IntValue(0);
-
-      assigner3.Name = "Reset NumberOfSuccessfulOffspring";
-      assigner3.LeftSideParameter.ActualName = "NumberOfSuccessfulOffspring";
+      assigner3.Name = "Reset NumberOfCreatedOffspring";
+      assigner3.LeftSideParameter.ActualName = "NumberOfCreatedOffspring";
       assigner3.RightSideParameter.Value = new IntValue(0);
 
-      assigner4.Name = "Reset OffspringList";
-      assigner4.LeftSideParameter.ActualName = "OffspringList";
-      assigner4.RightSideParameter.Value = new ScopeList();
+      assigner4.Name = "Reset NumberOfSuccessfulOffspring";
+      assigner4.LeftSideParameter.ActualName = "NumberOfSuccessfulOffspring";
+      assigner4.RightSideParameter.Value = new IntValue(0);
+
+      assigner5.Name = "Reset OffspringList";
+      assigner5.LeftSideParameter.ActualName = "OffspringList";
+      assigner5.RightSideParameter.Value = new ScopeList();
       #endregion
 
@@ -330 +347 @@
       childrenCreator.Successor = uniformSubScopesProcessor;
       uniformSubScopesProcessor.Operator = crossover;
-      uniformSubScopesProcessor.Successor = subScopesCounter1;
+      uniformSubScopesProcessor.Successor = intCounter1;
       crossover.Successor = stochasticBranch;
       stochasticBranch.FirstBranch = mutator;
@@ -338 +355 @@
       evaluator.Successor = weightedParentsQualityComparator;
       weightedParentsQualityComparator.Successor = subScopesRemover;
-      subScopesCounter1.Successor = intCounter1;
-      intCounter1.Successor = conditionalSelector;
+      intCounter1.Successor = intCounter2;
+      intCounter2.Successor = conditionalSelector;
       conditionalSelector.Successor = rightReducer1;
       rightReducer1.Successor = duplicateSelector;
@@ -358 +375 @@
       rightReducer2.Successor = null;
       scopeCleaner.Successor = offspringRestorer;
-      mergingReducer.Successor = intCounter2;
-      intCounter2.Successor = subScopesCounter3;
-      subScopesCounter3.Successor = analyzer2;
+      mergingReducer.Successor = assigner2;
+      assigner2.Successor = intCounter3;
+      intCounter3.Successor = subScopesCounter3;
+      subScopesCounter3.Successor = expressionEvaluator;
+      expressionEvaluator.Successor = analyzer2;
       analyzer2.Successor = comparator3;
       comparator3.Successor = conditionalBranch3;
@@ -367 +386 @@
       conditionalBranch3.Successor = null;
       comparator4.Successor = conditionalBranch4;
-      conditionalBranch4.FalseBranch = assigner2;
+      conditionalBranch4.FalseBranch = assigner3;
       conditionalBranch4.TrueBranch = null;
       conditionalBranch4.Successor = null;
-      assigner2.Successor = assigner3;
       assigner3.Successor = assigner4;
-      assigner4.Successor = selector;
+      assigner4.Successor = assigner5;
+      assigner5.Successor = selector;
 
       #endregion