Changeset 13443 for branches/ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/PriorityRulesVector/Manipulators

Timestamp:

12/08/15 14:31:05 (9 years ago)

Author:

mkommend

Message:

#2521: Adapted decoders for SchedulingProblem.

Location:

branches/ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/PriorityRulesVector/Manipulators

Files:

• PRVManipulator.cs (modified) (2 diffs)
• PRVUniformOnePositionManipulator.cs (modified) (1 diff)

branches/ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/PriorityRulesVector/Manipulators/PRVManipulator.cs

@@ -23 +23 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Data;
+using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -28 +30 @@
   [Item("PRVManipulator", "An operator which manipulates a PRV representation.")]
   [StorableClass]
-  public abstract class PRVManipulator : ScheduleManipulator, IPRVOperator {
+  public abstract class PRVManipulator : ScheduleManipulator, IPRVRulesOperator {
+
+    public ILookupParameter<IntValue> NumberOfRulesParameter {
+      get { return (ILookupParameter<IntValue>)Parameters["NumberOfRulesParameter"]; }
+    }
+
+
     [StorableConstructor]
     protected PRVManipulator(bool deserializing) : base(deserializing) { }
     protected PRVManipulator(PRVManipulator original, Cloner cloner) : base(original, cloner) { }
-    public PRVManipulator() : base() { }
 
-    protected abstract void Manipulate(IRandom random, PRVEncoding individual);
+    public PRVManipulator()
+      : base() {
+      Parameters.Add(new LookupParameter<IntValue>("NumberOfRulesParameter"));
+    }
+
+    protected abstract void Manipulate(IRandom random, PRVEncoding individual, int numberOfRules);
 
     public override IOperation InstrumentedApply() {
       var solution = ScheduleParameter.ActualValue as PRVEncoding;
       if (solution == null) throw new InvalidOperationException("ScheduleEncoding was not found or is not of type PRVEncoding.");
-      Manipulate(RandomParameter.ActualValue, solution);
+      Manipulate(RandomParameter.ActualValue, solution, NumberOfRulesParameter.ActualValue.Value);
       return base.InstrumentedApply();
     }

branches/ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/PriorityRulesVector/Manipulators/PRVUniformOnePositionManipulator.cs

@@ -40 +40 @@
     }
 
-    public static void Apply(IRandom random, PRVEncoding individual) {
-      UniformOnePositionManipulator.Apply(random, individual.PriorityRulesVector, new IntMatrix(new int[,] { { 0, individual.NrOfRules } }));
+    public static void Apply(IRandom random, PRVEncoding individual, int numberOfRules) {
+      UniformOnePositionManipulator.Apply(random, individual.PriorityRulesVector, new IntMatrix(new int[,] { { 0, numberOfRules } }));
     }
 
-    protected override void Manipulate(IRandom random, PRVEncoding individual) {
-      Apply(random, individual);
+    protected override void Manipulate(IRandom random, PRVEncoding individual, int numberOfRules) {
+      Apply(random, individual, numberOfRules);
     }
   }