Changeset 11739 for branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/Operators/SingleObjectiveMoveGenerator.cs

Timestamp:

01/08/15 15:52:05 (9 years ago)

Author:

mkommend

Message:

#2174: Worked on operators and programmable problem base classes and scripts.

File:

• branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/Operators/SingleObjectiveMoveGenerator.cs (modified) (6 diffs)

branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/Operators/SingleObjectiveMoveGenerator.cs

@@ -21 +21 @@
 
 using System;
+using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
@@ -34 +35 @@
   [Item("Single-objective MoveGenerator", "Calls the GetNeighbors method of the problem definition to obtain the moves.")]
   [StorableClass]
-  public class SingleObjectiveMoveGenerator : InstrumentedOperator, ISingleObjectiveMoveOperator, IMultiMoveGenerator, IStochasticOperator {
-
+  public class SingleObjectiveMoveGenerator : SingleSuccessorOperator, INeighborBasedOperator, IMultiMoveGenerator, IStochasticOperator {
     public ILookupParameter<IRandom> RandomParameter {
       get { return (ILookupParameter<IRandom>)Parameters["Random"]; }
@@ -44 +44 @@
     }
 
-    public ILookupParameter<ISingleObjectiveProblemDefinition> ProblemDefinitionParameter {
-      get { return (ILookupParameter<ISingleObjectiveProblemDefinition>)Parameters["ProblemDefinition"]; }
-    }
-
     public ILookupParameter<IEncoding> EncodingParameter {
       get { return (ILookupParameter<IEncoding>)Parameters["Encoding"]; }
     }
+
+    public Func<Individual, IRandom, IEnumerable<Individual>> GetNeighborsFunc { get; set; }
 
     [StorableConstructor]
@@ -59 +57 @@
       Parameters.Add(new LookupParameter<IRandom>("Random", "The random number generator to use."));
       Parameters.Add(new ValueLookupParameter<IntValue>("SampleSize", "The number of moves to sample."));
-      Parameters.Add(new LookupParameter<ISingleObjectiveProblemDefinition>("ProblemDefinition", "The host that holds the problem definition."));
       Parameters.Add(new LookupParameter<IEncoding>("Encoding", "An item that holds the problem's encoding."));
     }
@@ -67 +64 @@
     }
 
-    public override IOperation InstrumentedApply() {
+    public override IOperation Apply() {
       var random = RandomParameter.ActualValue;
-      var definition = ProblemDefinitionParameter.ActualValue;
-      if (definition == null) throw new InvalidOperationException("Problem definition is null.");
       var sampleSize = SampleSizeParameter.ActualValue.Value;
       var encoding = EncodingParameter.ActualValue;
       var individual = encoding.GetIndividual(ExecutionContext.Scope);
-      var nbhood = definition.GetNeighbors(random, individual).Take(sampleSize).ToList();
+      var nbhood = GetNeighborsFunc(individual, random).Take(sampleSize).ToList();
 
       var moveScopes = new Scope[nbhood.Count];
@@ -83 +78 @@
       ExecutionContext.Scope.SubScopes.AddRange(moveScopes);
 
-      return base.InstrumentedApply();
+      return base.Apply();
     }
   }