Changeset 7954

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)

Files:

• HeuristicLab.Algorithms.ScatterSearch/3.3/ScatterSearch.cs (modified) (3 diffs)
• HeuristicLab.Algorithms.ScatterSearch/3.3/ScatterSearchMainLoop.cs (modified) (8 diffs)
• HeuristicLab.Problems.TestFunctions/3.3/Improvers/SingleObjectiveTestFunctionImprovementOperator.cs (modified) (5 diffs)
• HeuristicLab.Problems.TestFunctions/3.3/SimilarityCalculators/SingleObjectiveTestFunctionSimilarityCalculator.cs (modified) (3 diffs)
• HeuristicLab.Problems.TestFunctions/3.3/SingleObjectiveTestFunctionProblem.cs (modified) (1 diff)

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";

branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.TestFunctions/3.3/Improvers/SingleObjectiveTestFunctionImprovementOperator.cs

@@ -45 +45 @@
       get { return (IValueParameter<DoubleValue>)Parameters["Beta"]; }
     }
+    public IValueLookupParameter<DoubleMatrix> BoundsParameter {
+      get { return (IValueLookupParameter<DoubleMatrix>)Parameters["Bounds"]; }
+    }
     public ScopeParameter CurrentScopeParameter {
       get { return (ScopeParameter)Parameters["CurrentScope"]; }
@@ -74 +77 @@
     private DoubleValue Beta {
       get { return BetaParameter.Value; }
+    }
+    private DoubleMatrix Bounds {
+      get { return BoundsParameter.ActualValue; }
     }
     public IScope CurrentScope {
@@ -109 +115 @@
       Parameters.Add(new ValueParameter<DoubleValue>("Alpha", new DoubleValue(1.0)));
       Parameters.Add(new ValueParameter<DoubleValue>("Beta", new DoubleValue(2.0)));
+      Parameters.Add(new ValueLookupParameter<DoubleMatrix>("Bounds"));
       Parameters.Add(new ScopeParameter("CurrentScope"));
       Parameters.Add(new ValueParameter<DoubleValue>("Delta", new DoubleValue(0.5)));
@@ -136 +143 @@
       for (int i = 0; i < simplex.Length; i++) {
         simplex[i] = bestSol.Clone() as RealVector;
-        simplex[i][i] += 0.1 * (Evaluator.Bounds[0, 1] - Evaluator.Bounds[0, 0]);
-        if (simplex[i][i] > Evaluator.Bounds[0, 1]) simplex[i][i] = Evaluator.Bounds[0, 1];
-        if (simplex[i][i] < Evaluator.Bounds[0, 0]) simplex[i][i] = Evaluator.Bounds[0, 0];
+        simplex[i][i] += 0.1 * (Bounds[0, 1] - Bounds[0, 0]);
+        if (simplex[i][i] > Bounds[0, 1]) simplex[i][i] = Bounds[0, 1];
+        if (simplex[i][i] < Bounds[0, 0]) simplex[i][i] = Bounds[0, 0];
       }
 
@@ -195 +202 @@
 
       for (int i = 0; i < simplex[0].Length; i++) {
-        if (simplex[0][i] > Evaluator.Bounds[0, 1]) simplex[0][i] = Evaluator.Bounds[0, 1];
-        if (simplex[0][i] < Evaluator.Bounds[0, 0]) simplex[0][i] = Evaluator.Bounds[0, 0];
+        if (simplex[0][i] > Bounds[0, 1]) simplex[0][i] = Bounds[0, 1];
+        if (simplex[0][i] < Bounds[0, 0]) simplex[0][i] = Bounds[0, 0];
       }
 

branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.TestFunctions/3.3/SimilarityCalculators/SingleObjectiveTestFunctionSimilarityCalculator.cs

@@ -26 +26 @@
 using HeuristicLab.Encodings.RealVectorEncoding;
 using HeuristicLab.Optimization.Operators;
-using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -36 +35 @@
   [StorableClass]
   public sealed class SingleObjectiveTestFunctionSimilarityCalculator : SimilarityCalculator {
-    #region Parameter properties
-    public ILookupParameter<DoubleMatrix> BoundsParameter {
-      get { return (ILookupParameter<DoubleMatrix>)Parameters["Bounds"]; }
-    }
-    #endregion
-
     #region Properties
-    private DoubleMatrix Bounds {
-      get { return BoundsParameter.ActualValue; }
-      set { BoundsParameter.ActualValue = value; }
-    }
+    public DoubleMatrix Bounds { get; set; }
     #endregion
 
@@ -52 +42 @@
     private SingleObjectiveTestFunctionSimilarityCalculator(bool deserializing) : base(deserializing) { }
     private SingleObjectiveTestFunctionSimilarityCalculator(SingleObjectiveTestFunctionSimilarityCalculator original, Cloner cloner) : base(original, cloner) { }
-    public SingleObjectiveTestFunctionSimilarityCalculator()
-      : base() {
-      #region Create parameters
-      Parameters.Add(new LookupParameter<DoubleMatrix>("Bounds"));
-      #endregion
-    }
+    public SingleObjectiveTestFunctionSimilarityCalculator() : base() { }
 
     public override IDeepCloneable Clone(Cloner cloner) {

branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.TestFunctions/3.3/SingleObjectiveTestFunctionProblem.cs

@@ -376 +376 @@
         op.ParentsParameter.Hidden = true;
       }
-      foreach (ISimilarityCalculator op in Operators.OfType<ISimilarityCalculator>()) {
+      foreach (SingleObjectiveTestFunctionSimilarityCalculator op in Operators.OfType<ISimilarityCalculator>()) {
         op.TargetParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName;
         op.TargetParameter.Hidden = true;
+        op.Bounds = Bounds;
       }
     }