Changeset 5356 for trunk/sources/HeuristicLab.Algorithms.EvolutionStrategy

Timestamp:

01/22/11 15:18:20 (13 years ago)

Author:

abeham

Message:

#1344

• Adapted all algorithms to count evaluated solutions / moves and outside of the parallel region
• Used the same pattern in every algorithm: Initialize and collect the variable in the Algorithm and increment it in the main loops and main operators

Location:

trunk/sources/HeuristicLab.Algorithms.EvolutionStrategy/3.3

Files:

• EvolutionStrategy.cs (modified) (previous)
• EvolutionStrategyMainLoop.cs (modified) (8 diffs)

trunk/sources/HeuristicLab.Algorithms.EvolutionStrategy/3.3/EvolutionStrategyMainLoop.cs

@@ -78 +78 @@
     public ValueLookupParameter<IOperator> AnalyzerParameter {
       get { return (ValueLookupParameter<IOperator>)Parameters["Analyzer"]; }
+    }
+    public LookupParameter<IntValue> EvaluatedSolutionsParameter {
+      get { return (LookupParameter<IntValue>)Parameters["EvaluatedSolutions"]; }
     }
     private ScopeParameter CurrentScopeParameter {
@@ -123 +126 @@
       Parameters.Add(new ValueLookupParameter<VariableCollection>("Results", "The variable collection where results should be stored."));
       Parameters.Add(new ValueLookupParameter<IOperator>("Analyzer", "The operator used to analyze each generation."));
+      Parameters.Add(new LookupParameter<IntValue>("EvaluatedSolutions", "The number of times solutions have been evaluated."));
       Parameters.Add(new ScopeParameter("CurrentScope", "The current scope which represents a population of solutions on which the EvolutionStrategy should be applied."));
       Parameters.Add(new ValueLookupParameter<IOperator>("StrategyParameterManipulator", "The operator to mutate the endogeneous strategy parameters."));
@@ -148 +152 @@
       UniformSubScopesProcessor uniformSubScopesProcessor3 = new UniformSubScopesProcessor();
       Placeholder evaluator = new Placeholder();
+      SubScopesCounter subScopesCounter = new SubScopesCounter();
       ConditionalBranch plusOrCommaReplacementBranch = new ConditionalBranch();
       MergingReducer plusReplacement = new MergingReducer();
@@ -155 +160 @@
       IntCounter intCounter = new IntCounter();
       Comparator comparator = new Comparator();
-      ResultsCollector resultsCollector2 = new ResultsCollector();
       Placeholder analyzer2 = new Placeholder();
       ConditionalBranch conditionalBranch = new ConditionalBranch();
@@ -208 +212 @@
       evaluator.OperatorParameter.ActualName = EvaluatorParameter.Name;
 
+      subScopesCounter.Name = "Increment EvaluatedSolutions";
+      subScopesCounter.ValueParameter.ActualName = EvaluatedSolutionsParameter.Name;
+
       plusOrCommaReplacementBranch.ConditionParameter.ActualName = PlusSelectionParameter.Name;
 
@@ -222 +229 @@
       comparator.ResultParameter.ActualName = "Terminate";
       comparator.RightSideParameter.ActualName = MaximumGenerationsParameter.Name;
-
-      resultsCollector2.CollectedValues.Add(new LookupParameter<IntValue>("Generations"));
-      resultsCollector2.ResultsParameter.ActualName = "Results";
 
       analyzer2.Name = "Analyzer (placeholder)";
@@ -258 +262 @@
       mutator2.Successor = null;
       uniformSubScopesProcessor3.Operator = evaluator;
-      uniformSubScopesProcessor3.Successor = null;
+      uniformSubScopesProcessor3.Successor = subScopesCounter;
       evaluator.Successor = null;
+      subScopesCounter.Successor = null;
       plusOrCommaReplacementBranch.TrueBranch = plusReplacement;
       plusOrCommaReplacementBranch.FalseBranch = commaReplacement;
@@ -266 +271 @@
       rightReducer.Successor = intCounter;
       intCounter.Successor = comparator;
-      comparator.Successor = resultsCollector2;
-      resultsCollector2.Successor = analyzer2;
+      comparator.Successor = analyzer2;
       analyzer2.Successor = conditionalBranch;
       conditionalBranch.FalseBranch = selector;