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

Timestamp:

11/25/15 23:24:01 (9 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)

Location:

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

Files:

• AdditiveMoveGenerator.cs (modified) (4 diffs)
• AdditiveMoveMaker.cs (modified) (2 diffs)
• AdditiveMoveTabuChecker.cs (modified) (1 diff)
• AdditiveMoveTabuMaker.cs (modified) (1 diff)

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();
     }

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

@@ -31 +31 @@
   [Item("AdditiveMoveMaker", "Peforms an additive move on a given real vector and updates the quality.")]
   [StorableClass]
-  public class AdditiveMoveMaker : SingleSuccessorOperator, IAdditiveRealVectorMoveOperator, IMoveMaker, ISingleObjectiveOperator {
+  public class AdditiveMoveMaker : SingleSuccessorOperator, IRealVectorAdditiveMoveQualityOperator, IMoveMaker, ISingleObjectiveOperator {
     public override bool CanChangeName {
       get { return false; }
@@ -63 +63 @@
     }
 
+    public static void Apply(RealVector realVector, AdditiveMove move) {
+      realVector[move.Dimension] += move.MoveDistance;
+    }
+
     public override IOperation Apply() {
-      AdditiveMove move = AdditiveMoveParameter.ActualValue;
-      RealVector realVector = RealVectorParameter.ActualValue;
-      DoubleValue moveQuality = MoveQualityParameter.ActualValue;
-      DoubleValue quality = QualityParameter.ActualValue;
+      Apply(RealVectorParameter.ActualValue, AdditiveMoveParameter.ActualValue);
+      var moveQuality = MoveQualityParameter.ActualValue;
+      var quality = QualityParameter.ActualValue;
 
-      realVector[move.Dimension] += move.MoveDistance;
       quality.Value = moveQuality.Value;
 

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

@@ -32 +32 @@
   [Item("AdditiveMoveTabuChecker", "Prevents falling back into ranges that have been moved over before.")]
   [StorableClass]
-  public class AdditiveMoveTabuChecker : SingleSuccessorOperator, IAdditiveRealVectorMoveOperator, ITabuChecker {
+  public class AdditiveMoveTabuChecker : SingleSuccessorOperator, IRealVectorAdditiveMoveQualityOperator, ITabuChecker {
     public override bool CanChangeName {
       get { return false; }

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

@@ -29 +29 @@
   [Item("AdditiveMoveTabuMaker", "Sets the move tabu.")]
   [StorableClass]
-  public class AdditiveMoveTabuMaker : TabuMaker, IAdditiveRealVectorMoveOperator {
+  public class AdditiveMoveTabuMaker : TabuMaker, IRealVectorAdditiveMoveQualityOperator {
     public ILookupParameter<AdditiveMove> AdditiveMoveParameter {
       get { return (ILookupParameter<AdditiveMove>)Parameters["AdditiveMove"]; }