Changeset 8887 for trunk/sources/HeuristicLab.Encodings.ScheduleEncoding/3.3/PriorityRulesVector

Timestamp:

11/11/12 22:57:09 (12 years ago)

Author:

abeham

Message:

#1329:

• Moved decoders and evaluators from encoding to problem
• Removed unnecessary state variables in operators
• Introduced parameters in interfaces and added wiring code
• Removed ConcreteScheduleManipulator as it does not perform any manipulation
• Made ErrorPolicy and ForcingStrategy configurable and added views for them
• Renamed the SchedulingEvaluationAlgorithm and also converted the AlgorithmOperator to a SingleSuccessorOperator
• Fixed Plugin- and AssemblyFileVersion
• Added missing license headers

Location:

trunk/sources/HeuristicLab.Encodings.ScheduleEncoding/3.3/PriorityRulesVector

Files:

• Crossovers/PRVCrossover.cs (modified) (2 diffs)
• Crossovers/PRVDiscreteCrossover.cs (modified) (1 diff)
• Crossovers/PRVSinglePointCrossover.cs (modified) (1 diff)
• Manipulators/PRVManipulator.cs (modified) (3 diffs)
• Manipulators/PRVUniformOnePositionManipulator.cs (modified) (1 diff)
• PRVEncoding.cs (modified) (3 diffs)
• PRVRandomCreator.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.Encodings.ScheduleEncoding/3.3/PriorityRulesVector/Crossovers/PRVCrossover.cs

@@ -27 +27 @@
   [Item("PRVCrossover", "An operator which crosses two PRV representations.")]
   [StorableClass]
-  public abstract class PRVCrossover : ScheduleCrossover<PRVEncoding>, IPRVOperator {
+  public abstract class PRVCrossover : ScheduleCrossover, IPRVOperator {
+
     [StorableConstructor]
     protected PRVCrossover(bool deserializing) : base(deserializing) { }
@@ -37 +38 @@
     }
 
-
     public abstract PRVEncoding Cross(IRandom random, PRVEncoding parent1, PRVEncoding parent2);
 
     public override IOperation Apply() {
-      ItemArray<PRVEncoding> parents = ParentsParameter.ActualValue;
+      var parents = ParentsParameter.ActualValue;
       ChildParameter.ActualValue =
         Cross(RandomParameter.ActualValue, parents[0] as PRVEncoding, parents[1] as PRVEncoding);

trunk/sources/HeuristicLab.Encodings.ScheduleEncoding/3.3/PriorityRulesVector/Crossovers/PRVDiscreteCrossover.cs

@@ -29 +29 @@
   [StorableClass]
   public class PRVDiscreteCrossover : PRVCrossover {
+
     [StorableConstructor]
     protected PRVDiscreteCrossover(bool deserializing) : base(deserializing) { }
-    protected PRVDiscreteCrossover(PRVDiscreteCrossover original, Cloner cloner)
-      : base(original, cloner) {
-    }
+    protected PRVDiscreteCrossover(PRVDiscreteCrossover original, Cloner cloner) : base(original, cloner) { }
+    public PRVDiscreteCrossover() : base() { }
+
     public override IDeepCloneable Clone(Cloner cloner) {
       return new PRVDiscreteCrossover(this, cloner);
     }
-    public PRVDiscreteCrossover() : base() { }
-
 
     public static PRVEncoding Apply(IRandom random, PRVEncoding parent1, PRVEncoding parent2) {
       return new PRVEncoding(DiscreteCrossover.Apply(random, new ItemArray<IntegerVector>(new IntegerVector[] { parent1.PriorityRulesVector, parent2.PriorityRulesVector })), parent1.NrOfRules);
     }
+
     public override PRVEncoding Cross(IRandom random, PRVEncoding parent1, PRVEncoding parent2) {
       return Apply(random, parent1, parent2);

trunk/sources/HeuristicLab.Encodings.ScheduleEncoding/3.3/PriorityRulesVector/Crossovers/PRVSinglePointCrossover.cs

@@ -29 +29 @@
   [StorableClass]
   public class PRVSinglePointCrossover : PRVCrossover {
+
     [StorableConstructor]
     protected PRVSinglePointCrossover(bool deserializing) : base(deserializing) { }
-    protected PRVSinglePointCrossover(PRVSinglePointCrossover original, Cloner cloner)
-      : base(original, cloner) {
-    }
+    protected PRVSinglePointCrossover(PRVSinglePointCrossover original, Cloner cloner) : base(original, cloner) { }
+    public PRVSinglePointCrossover() : base() { }
+
     public override IDeepCloneable Clone(Cloner cloner) {
       return new PRVSinglePointCrossover(this, cloner);
     }
-    public PRVSinglePointCrossover() : base() { }
 
     public static PRVEncoding Apply(IRandom random, PRVEncoding parent1, PRVEncoding parent2) {

trunk/sources/HeuristicLab.Encodings.ScheduleEncoding/3.3/PriorityRulesVector/Manipulators/PRVManipulator.cs

@@ -20 +20 @@
 #endregion
 
+using System;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -27 +28 @@
   [Item("PRVManipulator", "An operator which manipulates a PRV representation.")]
   [StorableClass]
-  public abstract class PRVManipulator : ScheduleManipulator<PRVEncoding>, IPRVOperator {
+  public abstract class PRVManipulator : ScheduleManipulator, IPRVOperator {
     [StorableConstructor]
     protected PRVManipulator(bool deserializing) : base(deserializing) { }
@@ -36 +37 @@
     }
 
+    protected abstract void Manipulate(IRandom random, PRVEncoding individual);
 
-    protected abstract void Manipulate(IRandom random, PRVEncoding individual);
     public override IOperation Apply() {
-      PRVEncoding solution = ScheduleEncodingParameter.ActualValue;
+      var solution = ScheduleEncodingParameter.ActualValue as PRVEncoding;
+      if (solution == null) throw new InvalidOperationException("ScheduleEncoding was not found or is not of type PRVEncoding.");
       Manipulate(RandomParameter.ActualValue, solution);
       return base.Apply();

trunk/sources/HeuristicLab.Encodings.ScheduleEncoding/3.3/PriorityRulesVector/Manipulators/PRVUniformOnePositionManipulator.cs

@@ -27 +27 @@
 
 namespace HeuristicLab.Encodings.ScheduleEncoding.PriorityRulesVector {
-
   [Item("PRVUniformOnePositionManipulator", "Represents a manipulation operation inserting parts of the individual at another position.")]
   [StorableClass]
   public class PRVUniformOnePositionManipulator : PRVManipulator {
+
     [StorableConstructor]
     protected PRVUniformOnePositionManipulator(bool deserializing) : base(deserializing) { }
-    protected PRVUniformOnePositionManipulator(PRVUniformOnePositionManipulator original, Cloner cloner)
-      : base(original, cloner) {
-    }
+    protected PRVUniformOnePositionManipulator(PRVUniformOnePositionManipulator original, Cloner cloner) : base(original, cloner) { }
+    public PRVUniformOnePositionManipulator() : base() { }
+
     public override IDeepCloneable Clone(Cloner cloner) {
       return new PRVUniformOnePositionManipulator(this, cloner);
     }
-    public PRVUniformOnePositionManipulator() : base() { }
-
 
     public static void Apply(IRandom random, PRVEncoding individual) {

trunk/sources/HeuristicLab.Encodings.ScheduleEncoding/3.3/PriorityRulesVector/PRVEncoding.cs

@@ -42 +42 @@
     }
 
-
     [StorableConstructor]
     protected PRVEncoding(bool deserializing) : base(deserializing) { }
@@ -49 +48 @@
       this.nrOfRules = cloner.Clone(original.NrOfRules);
       this.PriorityRulesVector = cloner.Clone(original.PriorityRulesVector);
-    }
-    public override IDeepCloneable Clone(Cloner cloner) {
-      return new PRVEncoding(this, cloner);
     }
     public PRVEncoding(int nrOfRules)
@@ -69 +65 @@
     }
 
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new PRVEncoding(this, cloner);
+    }
 
     public override string ToString() {

trunk/sources/HeuristicLab.Encodings.ScheduleEncoding/3.3/PriorityRulesVector/PRVRandomCreator.cs

@@ -27 +27 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-
 namespace HeuristicLab.Encodings.ScheduleEncoding.PriorityRulesVector {
   [Item("PriorityRulesRandomCreator", "Creator class used to create PRV encoding objects for scheduling problems.")]
   [StorableClass]
-  public class PRVRandomCreator : ScheduleCreator<PRVEncoding>, IStochasticOperator {
+  public class PRVRandomCreator : ScheduleCreator, IStochasticOperator {
+
     [Storable]
     public IntValue NrOfRules { get; set; }
@@ -45 +45 @@
     }
 
-
     [StorableConstructor]
     protected PRVRandomCreator(bool deserializing) : base(deserializing) { }
@@ -51 +50 @@
       : base(original, cloner) {
       this.NrOfRules = cloner.Clone(original.NrOfRules);
-    }
-    public override IDeepCloneable Clone(Cloner cloner) {
-      return new PRVRandomCreator(this, cloner);
     }
     public PRVRandomCreator()
@@ -64 +60 @@
     }
 
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new PRVRandomCreator(this, cloner);
+    }
+
     public static PRVEncoding Apply(int jobs, int resources, IRandom random, IntValue nrOfRules) {
       return new PRVEncoding(jobs * resources, random, 0, nrOfRules.Value, nrOfRules);
     }
 
-    protected override PRVEncoding CreateSolution() {
+    protected override IScheduleEncoding CreateSolution() {
       return Apply(JobsParameter.ActualValue.Value, ResourcesParameter.ActualValue.Value, RandomParameter.ActualValue, NrOfRules);
     }