Changeset 13403 for branches/ProblemRefactoring/HeuristicLab.Encodings.RealVectorEncoding/3.3/Moves/AdditiveMoveGenerator.cs

Timestamp:

11/25/15 23:24:01 (8 years ago)

Author:

abeham

Message:

#2521:

• Adapted single-objective test function problem to new problem infrastructure
• Added additional interfaces to RealVectorEncoding
• Fixed IParticleUpdater interface (must implement IStochasticOperator if it contains a Random parameter)

File:

• branches/ProblemRefactoring/HeuristicLab.Encodings.RealVectorEncoding/3.3/Moves/AdditiveMoveGenerator.cs (modified) (4 diffs)

branches/ProblemRefactoring/HeuristicLab.Encodings.RealVectorEncoding/3.3/Moves/AdditiveMoveGenerator.cs

@@ -31 +31 @@
   [Item("AdditiveMoveGenerator", "Base class for all additive move generators.")]
   [StorableClass]
-  public abstract class AdditiveMoveGenerator : SingleSuccessorOperator, IAdditiveRealVectorMoveOperator, IMoveGenerator, IStochasticOperator {
+  public abstract class AdditiveMoveGenerator : SingleSuccessorOperator, IRealVectorAdditiveMoveOperator, IMoveGenerator, IStochasticOperator {
     public override bool CanChangeName {
       get { return false; }
@@ -43 +43 @@
     public ILookupParameter<AdditiveMove> AdditiveMoveParameter {
       get { return (LookupParameter<AdditiveMove>)Parameters["AdditiveMove"]; }
-    }
-    protected ScopeParameter CurrentScopeParameter {
-      get { return (ScopeParameter)Parameters["CurrentScope"]; }
     }
     public IValueLookupParameter<DoubleMatrix> BoundsParameter {
@@ -59 +56 @@
       Parameters.Add(new LookupParameter<RealVector>("RealVector", "The real vector for which moves should be generated."));
       Parameters.Add(new LookupParameter<AdditiveMove>("AdditiveMove", "The moves that should be generated in subscopes."));
-      Parameters.Add(new ScopeParameter("CurrentScope", "The current scope where the moves should be added as subscopes."));
       Parameters.Add(new ValueLookupParameter<DoubleMatrix>("Bounds", "A 2 column matrix specifying the lower and upper bound for each dimension. If there are less rows than dimension the bounds vector is cycled."));
     }
@@ -72 +68 @@
         moveScopes[i].Variables.Add(new Variable(AdditiveMoveParameter.ActualName, moves[i]));
       }
-      CurrentScopeParameter.ActualValue.SubScopes.AddRange(moveScopes);
+      ExecutionContext.Scope.SubScopes.AddRange(moveScopes);
       return base.Apply();
     }