Changeset 7954 for branches/ScatterSearch (trunk integration)/HeuristicLab.Algorithms.ScatterSearch/3.3/ScatterSearch.cs

Timestamp:

06/04/12 16:48:59 (12 years ago)

Author:

jkarder

Message:

#1331:

• added EvaluatedSolutions parameter
• SingleObjectiveTestFunctionImprovementOperator now retrieves the bounds from the scope tree
• SingleObjectiveTestFunctionProblem now assigns the bounds to the similarity calculator

File:

• branches/ScatterSearch (trunk integration)/HeuristicLab.Algorithms.ScatterSearch/3.3/ScatterSearch.cs (modified) (3 diffs)

branches/ScatterSearch (trunk integration)/HeuristicLab.Algorithms.ScatterSearch/3.3/ScatterSearch.cs

@@ -194 +194 @@
       Placeholder solutionEvaluator = new Placeholder();
       Placeholder solutionImprover = new Placeholder();
+      SubScopesCounter subScopesCounter = new SubScopesCounter();
+      ResultsCollector resultsCollector = new ResultsCollector();
       BestSelector bestSelector = new BestSelector();
       ScatterSearchMainLoop mainLoop = new ScatterSearchMainLoop();
@@ -210 +212 @@
 
       uniformSubScopesProcessor.Operator = solutionImprover;
-      uniformSubScopesProcessor.Successor = bestSelector;
+      uniformSubScopesProcessor.Successor = subScopesCounter;
 
       solutionImprover.Name = "SolutionImprover";
@@ -219 +221 @@
       solutionEvaluator.OperatorParameter.ActualName = "Evaluator";
       solutionEvaluator.Successor = null;
+
+      subScopesCounter.Name = "Initialize EvaluatedSolutions";
+      subScopesCounter.ValueParameter.ActualName = "EvaluatedSolutions";
+      subScopesCounter.Successor = resultsCollector;
+
+      resultsCollector.Name = "ResultsCollector";
+      resultsCollector.CollectedValues.Add(new LookupParameter<IntValue>("EvaluatedSolutions", null, "EvaluatedSolutions"));
+      resultsCollector.Successor = bestSelector;
 
       bestSelector.NumberOfSelectedSubScopesParameter.ActualName = NumberOfHighQualitySolutionsParameter.Name;