Changeset 13336 for branches/ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/Operators/SingleObjectiveImprover.cs

Timestamp:

11/23/15 15:15:27 (9 years ago)

Author:

mkommend

Message:

#2521: Refactored encodings and problems.

File:

• branches/ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/Operators/SingleObjectiveImprover.cs (modified) (6 diffs)

branches/ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/Operators/SingleObjectiveImprover.cs

@@ -33 +33 @@
   [Item("Single-objective Improver", "Improves a solution by calling GetNeighbors and Evaluate of the corresponding problem definition.")]
   [StorableClass]
-  public sealed class SingleObjectiveImprover : SingleSuccessorOperator, INeighborBasedOperator, IImprovementOperator, ISingleObjectiveEvaluationOperator, IStochasticOperator {
+  public sealed class SingleObjectiveImprover<TSolution> : SingleSuccessorOperator, INeighborBasedOperator<TSolution>, IImprovementOperator, ISingleObjectiveEvaluationOperator<TSolution>, IStochasticOperator
+    where TSolution : class, ISolution {
     public ILookupParameter<IRandom> RandomParameter {
       get { return (ILookupParameter<IRandom>)Parameters["Random"]; }
     }
 
-    public ILookupParameter<IEncoding> EncodingParameter {
-      get { return (ILookupParameter<IEncoding>)Parameters["Encoding"]; }
+    public ILookupParameter<IEncoding<TSolution>> EncodingParameter {
+      get { return (ILookupParameter<IEncoding<TSolution>>)Parameters["Encoding"]; }
     }
 
@@ -62 +63 @@
     }
 
-    public Func<Individual, IRandom, double> EvaluateFunc { get; set; }
-    public Func<Individual, IRandom, IEnumerable<Individual>> GetNeighborsFunc { get; set; }
+    public Func<TSolution, IRandom, double> EvaluateFunc { get; set; }
+    public Func<TSolution, IRandom, IEnumerable<TSolution>> GetNeighborsFunc { get; set; }
 
     [StorableConstructor]
     private SingleObjectiveImprover(bool deserializing) : base(deserializing) { }
-    private SingleObjectiveImprover(SingleObjectiveImprover original, Cloner cloner) : base(original, cloner) { }
+    private SingleObjectiveImprover(SingleObjectiveImprover<TSolution> original, Cloner cloner) : base(original, cloner) { }
     public SingleObjectiveImprover() {
       Parameters.Add(new LookupParameter<IRandom>("Random", "The random number generator to use."));
-      Parameters.Add(new LookupParameter<IEncoding>("Encoding", "An item that holds the problem's encoding."));
+      Parameters.Add(new LookupParameter<IEncoding<TSolution>>("Encoding", "An item that holds the problem's encoding."));
       Parameters.Add(new LookupParameter<DoubleValue>("Quality", "The quality of the parameter vector."));
       Parameters.Add(new LookupParameter<BoolValue>("Maximization", "Whether the problem should be minimized or maximized."));
@@ -79 +80 @@
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new SingleObjectiveImprover(this, cloner);
+      return new SingleObjectiveImprover<TSolution>(this, cloner);
     }
 
@@ -88 +89 @@
       var maxAttempts = ImprovementAttemptsParameter.ActualValue.Value;
       var sampleSize = SampleSizeParameter.ActualValue.Value;
-      var individual = encoding.GetIndividual(ExecutionContext.Scope);
-      var quality = QualityParameter.ActualValue == null ? EvaluateFunc(individual, random) : QualityParameter.ActualValue.Value;
+      var solution = ScopeUtil.GetSolution(ExecutionContext.Scope, encoding);
+      var quality = QualityParameter.ActualValue == null ? EvaluateFunc(solution, random) : QualityParameter.ActualValue.Value;
 
       var count = 0;
       for (var i = 0; i < maxAttempts; i++) {
-        Individual best = null;
+        TSolution best = default(TSolution);
         var bestQuality = quality;
-        foreach (var neighbor in GetNeighborsFunc(individual, random).Take(sampleSize)) {
+        foreach (var neighbor in GetNeighborsFunc(solution, random).Take(sampleSize)) {
           var q = EvaluateFunc(neighbor, random);
           count++;
@@ -103 +104 @@
         }
         if (best == null) break;
-        individual = best;
+        solution = best;
         quality = bestQuality;
       }
@@ -109 +110 @@
       LocalEvaluatedSolutionsParameter.ActualValue = new IntValue(count);
       QualityParameter.ActualValue = new DoubleValue(quality);
-      individual.CopyToScope(ExecutionContext.Scope);
+
+      ScopeUtil.CopySolutionToScope(ExecutionContext.Scope, encoding, solution);
       return base.Apply();
     }