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

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

Location:

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

Files:

• ScatterSearch.cs (modified) (3 diffs)
• ScatterSearchMainLoop.cs (modified) (8 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;

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

@@ -47 +47 @@
       get { return (IValueLookupParameter<ICrossover>)Parameters["Crossover"]; }
     }
+    public IValueLookupParameter<IntValue> EvaluatedSolutionsParameter {
+      get { return (IValueLookupParameter<IntValue>)Parameters["EvaluatedSolutions"]; }
+    }
     public IValueLookupParameter<IEvaluator> EvaluatorParameter {
       get { return (IValueLookupParameter<IEvaluator>)Parameters["Evaluator"]; }
@@ -109 +112 @@
       get { return CrossoverParameter.ActualValue; }
       set { CrossoverParameter.ActualValue = value; }
+    }
+    private IntValue EvaluatedSolutions {
+      get { return EvaluatedSolutionsParameter.ActualValue; }
+      set { EvaluatedSolutionsParameter.ActualValue = value; }
     }
     private IEvaluator Evaluator {
@@ -190 +197 @@
       Parameters.Add(new ValueLookupParameter<DoubleValue>("BestKnownQuality"));
       Parameters.Add(new ValueLookupParameter<ICrossover>("Crossover"));
+      Parameters.Add(new ValueLookupParameter<IntValue>("EvaluatedSolutions"));
       Parameters.Add(new ValueLookupParameter<IEvaluator>("Evaluator"));
       Parameters.Add(new ValueLookupParameter<BoolValue>("ExecutePathRelinking"));
@@ -231 +239 @@
       SolutionPoolUpdateMethod solutionPoolUpdateMethod = new SolutionPoolUpdateMethod();
       SolutionsCreator solutionsCreator = new SolutionsCreator();
+      SubScopesCounter subScopesCounter1 = new SubScopesCounter();
+      SubScopesCounter subScopesCounter2 = new SubScopesCounter();
       SubScopesProcessor subScopesProcessor1 = new SubScopesProcessor();
       SubScopesProcessor subScopesProcessor2 = new SubScopesProcessor();
@@ -316 +326 @@
       uniformSubScopesProcessor2.DepthParameter.Value = new IntValue(2);
       uniformSubScopesProcessor2.Operator = solutionImprover1;
+      uniformSubScopesProcessor2.Successor = subScopesCounter1;
 
       solutionImprover1.Name = "SolutionImprover";
@@ -323 +334 @@
       solutionEvaluator1.Name = "SolutionEvaluator";
       solutionEvaluator1.OperatorParameter.ActualName = "Evaluator";
+
+      subScopesCounter1.Name = "Increment EvaluatedSolutions";
+      subScopesCounter1.ValueParameter.ActualName = EvaluatedSolutionsParameter.Name;
 
       solutionPoolUpdateMethod.QualityParameter.ActualName = QualityParameter.ActualName;
@@ -350 +364 @@
       uniformSubScopesProcessor3.DepthParameter.Value = new IntValue(1);
       uniformSubScopesProcessor3.Operator = solutionImprover2;
+      uniformSubScopesProcessor3.Successor = subScopesCounter2;
 
       solutionImprover2.Name = "SolutionImprover";
@@ -357 +372 @@
       solutionEvaluator2.Name = "SolutionEvaluator";
       solutionEvaluator2.OperatorParameter.ActualName = "Evaluator";
+
+      subScopesCounter2.Name = "Increment EvaluatedSolutions";
+      subScopesCounter2.ValueParameter.ActualName = EvaluatedSolutionsParameter.Name;
 
       iterationsCounter.Name = "IterationCounter";