Changeset 17461 for branches/2521_ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/PriorityRulesVector

Timestamp:

02/28/20 16:23:01 (5 years ago)

Author:

abeham

Message:

#2521: worked on scheduling problem

Location:

branches/2521_ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/PriorityRulesVector

Files:

• Crossovers/PRVCrossover.cs (modified) (1 diff)
• Crossovers/PRVDiscreteCrossover.cs (modified) (1 diff)
• Crossovers/PRVSinglePointCrossover.cs (modified) (1 diff)
• Decoder/PRVDecoder.cs (modified) (2 diffs)
• Manipulators/PRVManipulator.cs (modified) (1 diff)
• Manipulators/PRVUniformOnePositionManipulator.cs (modified) (1 diff)
• PRV.cs (added)
• PRVEncoding.cs (deleted)
• PRVRandomCreator.cs (modified) (2 diffs)
• PriorityRulesVectorEncoding.cs (modified) (2 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/PriorityRulesVector/Crossovers/PRVCrossover.cs

@@ -34 +34 @@
     public PRVCrossover() : base() { }
 
-    public abstract PRVEncoding Cross(IRandom random, PRVEncoding parent1, PRVEncoding parent2);
+    public abstract PRV Cross(IRandom random, PRV parent1, PRV parent2);
 
     public override IOperation InstrumentedApply() {
       var parents = ParentsParameter.ActualValue;
       ChildParameter.ActualValue =
-        Cross(RandomParameter.ActualValue, parents[0] as PRVEncoding, parents[1] as PRVEncoding);
+        Cross(RandomParameter.ActualValue, parents[0] as PRV, parents[1] as PRV);
       return base.InstrumentedApply();
     }

branches/2521_ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/PriorityRulesVector/Crossovers/PRVDiscreteCrossover.cs

@@ -39 +39 @@
     }
 
-    public static PRVEncoding Apply(IRandom random, PRVEncoding parent1, PRVEncoding parent2) {
+    public static PRV Apply(IRandom random, PRV parent1, PRV parent2) {
       var randomSeed = random.Next();
       var integerVector = DiscreteCrossover.Apply(random, new ItemArray<IntegerVector>(new[] { parent1.PriorityRulesVector, parent2.PriorityRulesVector }));
-      return new PRVEncoding(integerVector, randomSeed);
+      return new PRV(integerVector, randomSeed);
     }
 
-    public override PRVEncoding Cross(IRandom random, PRVEncoding parent1, PRVEncoding parent2) {
+    public override PRV Cross(IRandom random, PRV parent1, PRV parent2) {
       return Apply(random, parent1, parent2);
     }

branches/2521_ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/PriorityRulesVector/Crossovers/PRVSinglePointCrossover.cs

@@ -39 +39 @@
     }
 
-    public static PRVEncoding Apply(IRandom random, PRVEncoding parent1, PRVEncoding parent2) {
+    public static PRV Apply(IRandom random, PRV parent1, PRV parent2) {
       var randomSeed = random.Next();
       var integerVector = SinglePointCrossover.Apply(random, parent1.PriorityRulesVector, parent2.PriorityRulesVector);
-      return new PRVEncoding(integerVector, randomSeed);
+      return new PRV(integerVector, randomSeed);
     }
 
-    public override PRVEncoding Cross(IRandom random, PRVEncoding parent1, PRVEncoding parent2) {
+    public override PRV Cross(IRandom random, PRV parent1, PRV parent2) {
       return Apply(random, parent1, parent2);
     }

branches/2521_ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/PriorityRulesVector/Decoder/PRVDecoder.cs

@@ -29 +29 @@
   [Item("JobSequencingMatrixDecoder", "Applies the GifflerThompson algorithm to create an active schedule from a JobSequencing Matrix.")]
   [StorableType("2D059957-AC7C-4B33-BADE-96706AEBAF29")]
-  public class PRVDecoder : ScheduleDecoder<PRVEncoding> {
+  public class PRVDecoder : ScheduleDecoder<PRV>, IPRVOperator {
     #region Priority Rules
     //smallest number of remaining tasks
@@ -187 +187 @@
     }
 
-    public override Schedule DecodeSchedule(PRVEncoding encoding, ItemList<Job> jobData) {
+    public override Schedule DecodeSchedule(PRV encoding, ItemList<Job> jobData) {
       return Decode(encoding, jobData);
     }
 
-    public static Schedule Decode(PRVEncoding solution, ItemList<Job> jobData) {
+    public static Schedule Decode(PRV solution, ItemList<Job> jobData) {
       var random = new FastRandom(solution.RandomSeed);
       var jobs = (ItemList<Job>)jobData.Clone();

branches/2521_ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/PriorityRulesVector/Manipulators/PRVManipulator.cs

@@ -46 +46 @@
     }
 
-    protected abstract void Manipulate(IRandom random, PRVEncoding individual, int numberOfRules);
+    protected abstract void Manipulate(IRandom random, PRV individual, int numberOfRules);
 
     public override IOperation InstrumentedApply() {
-      var solution = ScheduleParameter.ActualValue as PRVEncoding;
+      var solution = ScheduleParameter.ActualValue as PRV;
       if (solution == null) throw new InvalidOperationException("ScheduleEncoding was not found or is not of type PRVEncoding.");
       Manipulate(RandomParameter.ActualValue, solution, NumberOfRulesParameter.ActualValue.Value);

branches/2521_ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/PriorityRulesVector/Manipulators/PRVUniformOnePositionManipulator.cs

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

branches/2521_ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/PriorityRulesVector/PRVRandomCreator.cs

@@ -29 +29 @@
   [Item("PriorityRulesRandomCreator", "Creator class used to create PRV encoding objects for scheduling problems.")]
   [StorableType("5FF2A11E-86F9-4A8B-8E1C-713D6801506C")]
-  public class PRVRandomCreator : ScheduleCreator<PRVEncoding>, IStochasticOperator {
+  public class PRVRandomCreator : ScheduleCreator<PRV>, IStochasticOperator {
 
     [Storable]
@@ -54 +54 @@
     }
 
-    public static PRVEncoding Apply(int jobs, int resources, IRandom random, int nrOfRules) {
-      return new PRVEncoding(jobs * resources, random, 0, nrOfRules);
+    public static PRV Apply(int jobs, int resources, IRandom random, int nrOfRules) {
+      return new PRV(jobs * resources, random, 0, nrOfRules);
     }
 
-    protected override PRVEncoding CreateSolution() {
+    protected override PRV CreateSolution() {
       return Apply(JobsParameter.ActualValue.Value, ResourcesParameter.ActualValue.Value, RandomParameter.ActualValue, NrOfRules);
     }

branches/2521_ProblemRefactoring/HeuristicLab.Encodings.ScheduleEncoding/3.3/PriorityRulesVector/PriorityRulesVectorEncoding.cs

@@ -34 +34 @@
 namespace HeuristicLab.Encodings.ScheduleEncoding {
   [StorableType("9C419EE5-F3A8-4F06-8263-7D37D3AE1C72")]
-  public sealed class PriorityRulesVectorEncoding : ScheduleEncoding<PRVEncoding> {
+  public sealed class PriorityRulesVectorEncoding : ScheduleEncoding<PRV> {
 
     private IFixedValueParameter<IntValue> numberOfRulesParameter;
@@ -60 +60 @@
 
     public PriorityRulesVectorEncoding()
-      : base() {
+      : base("PRV") {
       //TODO change to meaningful value
       numberOfRulesParameter = new FixedValueParameter<IntValue>(Name + ".NumberOfRules", new IntValue(10));