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

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/PermutationWithRepetition

Files:

• Crossovers/PWRCrossover.cs (modified) (2 diffs)
• Crossovers/PWRGOXCrossover.cs (modified) (3 diffs)
• Crossovers/PWRPPXCrossover.cs (modified) (2 diffs)
• Manipulators/PWRInsertionManipulator.cs (modified) (2 diffs)
• Manipulators/PWRManipulator.cs (modified) (3 diffs)
• PWREncoding.cs (modified) (5 diffs)
• PWRRandomCreator.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Encodings.ScheduleEncoding/3.3/PermutationWithRepetition/Crossovers/PWRCrossover.cs

@@ -27 +27 @@
   [Item("PWRCrossover", "An operator which crosses two JSM representations.")]
   [StorableClass]
-  public abstract class PWRCrossover : ScheduleCrossover<PWREncoding>, IPWROperator {
+  public abstract class PWRCrossover : ScheduleCrossover, IPWROperator {
 
     [StorableConstructor]
@@ -41 +41 @@
 
     public override IOperation Apply() {
-      ItemArray<PWREncoding> parents = ParentsParameter.ActualValue;
+      var parents = ParentsParameter.ActualValue;
 
       ChildParameter.ActualValue =

trunk/sources/HeuristicLab.Encodings.ScheduleEncoding/3.3/PermutationWithRepetition/Crossovers/PWRGOXCrossover.cs

@@ -31 +31 @@
   [StorableClass]
   public class PWRGOXCrossover : PWRCrossover {
+
     [StorableConstructor]
     protected PWRGOXCrossover(bool deserializing) : base(deserializing) { }
-    protected PWRGOXCrossover(PWRGOXCrossover original, Cloner cloner)
-      : base(original, cloner) {
-    }
+    protected PWRGOXCrossover(PWRGOXCrossover original, Cloner cloner) : base(original, cloner) { }
+    public PWRGOXCrossover() : base() { }
+
     public override IDeepCloneable Clone(Cloner cloner) {
       return new PWRGOXCrossover(this, cloner);
     }
-    public PWRGOXCrossover() : base() { }
 
     private static int[] GetLookUpForIndividual(List<int> p) {
-      int[] result = new int[p.Count];
-      Dictionary<int, int> lookUpTable = new Dictionary<int, int>();
+      var result = new int[p.Count];
+      var lookUpTable = new Dictionary<int, int>();
 
       for (int i = 0; i < p.Count; i++) {
@@ -54 +54 @@
       return result;
     }
+
     public static PWREncoding Apply(IRandom random, PWREncoding parent1, PWREncoding parent2) {
-      PWREncoding result = new PWREncoding();
+      var result = new PWREncoding();
 
-      List<int> p1 = ((IntegerVector)(parent1.PermutationWithRepetition.Clone())).ToList<int>();
-      List<int> p2 = ((IntegerVector)(parent2.PermutationWithRepetition.Clone())).ToList<int>();
-      List<int> child = new List<int>();
+      var p1 = ((IntegerVector)(parent1.PermutationWithRepetition.Clone())).ToList();
+      var p2 = ((IntegerVector)(parent2.PermutationWithRepetition.Clone())).ToList();
+      var child = new List<int>();
 
       int[] lookUpArrayP1 = GetLookUpForIndividual(p1);
@@ -90 +91 @@
     }
 
-
-
-
   }
 }

trunk/sources/HeuristicLab.Encodings.ScheduleEncoding/3.3/PermutationWithRepetition/Crossovers/PWRPPXCrossover.cs

@@ -31 +31 @@
   [StorableClass]
   public class PWRPPXCrossover : PWRCrossover {
+
     [StorableConstructor]
     protected PWRPPXCrossover(bool deserializing) : base(deserializing) { }
-    protected PWRPPXCrossover(PWRPPXCrossover original, Cloner cloner)
-      : base(original, cloner) {
-    }
+    protected PWRPPXCrossover(PWRPPXCrossover original, Cloner cloner) : base(original, cloner) { }
+    public PWRPPXCrossover() : base() { }
+
     public override IDeepCloneable Clone(Cloner cloner) {
       return new PWRPPXCrossover(this, cloner);
     }
-    public PWRPPXCrossover() : base() { }
 
     public static PWREncoding Apply(IRandom random, PWREncoding parent1, PWREncoding parent2) {
-      PWREncoding result = new PWREncoding();
-      List<int> p1 = ((IntegerVector)(parent1.PermutationWithRepetition.Clone())).ToList<int>();
-      List<int> p2 = ((IntegerVector)(parent2.PermutationWithRepetition.Clone())).ToList<int>();
-      List<int> child = new List<int>();
+      var result = new PWREncoding();
+      var p1 = ((IntegerVector)(parent1.PermutationWithRepetition.Clone())).ToList();
+      var p2 = ((IntegerVector)(parent2.PermutationWithRepetition.Clone())).ToList();
+      var child = new List<int>();
 
-      bool[] lookUpTable = new bool[parent1.PermutationWithRepetition.Length];
+      var lookUpTable = new bool[parent1.PermutationWithRepetition.Length];
       for (int i = 0; i < lookUpTable.Length; i++) {
         lookUpTable[i] = random.Next(2) == 1;
@@ -73 +73 @@
     }
 
-
   }
 }

trunk/sources/HeuristicLab.Encodings.ScheduleEncoding/3.3/PermutationWithRepetition/Manipulators/PWRInsertionManipulator.cs

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

trunk/sources/HeuristicLab.Encodings.ScheduleEncoding/3.3/PermutationWithRepetition/Manipulators/PWRManipulator.cs

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

trunk/sources/HeuristicLab.Encodings.ScheduleEncoding/3.3/PermutationWithRepetition/PWREncoding.cs

@@ -30 +30 @@
   [StorableClass]
   public class PWREncoding : Item, IScheduleEncoding {
+
     [Storable]
     public IntegerVector PermutationWithRepetition { get; set; }
-
 
     [StorableConstructor]
@@ -40 +40 @@
       this.PermutationWithRepetition = cloner.Clone(original.PermutationWithRepetition);
     }
-    public override IDeepCloneable Clone(Cloner cloner) {
-      return new PWREncoding(this, cloner);
-    }
     public PWREncoding()
       : base() {
       PermutationWithRepetition = new IntegerVector();
+    }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new PWREncoding(this, cloner);
     }
 
@@ -81 +82 @@
         return base.Equals(obj);
     }
+
     public override int GetHashCode() {
       if (PermutationWithRepetition.Length == 1)
@@ -88 +90 @@
       return 0;
     }
+
     private bool AreEqual(PWREncoding pWREncoding1, PWREncoding pWREncoding2) {
       if (pWREncoding1.PermutationWithRepetition.Length != pWREncoding2.PermutationWithRepetition.Length)
@@ -97 +100 @@
       return true;
     }
-
-
   }
 }

trunk/sources/HeuristicLab.Encodings.ScheduleEncoding/3.3/PermutationWithRepetition/PWRRandomCreator.cs

@@ -30 +30 @@
   [Item("PermutationWithRepetitionRandomCreator", "Creates PWR-individuals at random.")]
   [StorableClass]
-  public class PWRRandomCreator : ScheduleCreator<PWREncoding>, IStochasticOperator {
-    public IRandom Random {
-      get { return RandomParameter.ActualValue; }
-    }
+  public class PWRRandomCreator : ScheduleCreator, IStochasticOperator {
 
     public ILookupParameter<IRandom> RandomParameter {
@@ -47 +44 @@
     [StorableConstructor]
     protected PWRRandomCreator(bool deserializing) : base(deserializing) { }
-    protected PWRRandomCreator(PWRRandomCreator original, Cloner cloner)
-      : base(original, cloner) {
-    }
-    public override IDeepCloneable Clone(Cloner cloner) {
-      return new PWRRandomCreator(this, cloner);
-    }
-
+    protected PWRRandomCreator(PWRRandomCreator original, Cloner cloner) : base(original, cloner) { }
     public PWRRandomCreator()
       : base() {
@@ -63 +54 @@
     }
 
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new PWRRandomCreator(this, cloner);
+    }
+
     public static PWREncoding Apply(int jobs, int resources, IRandom random) {
       return new PWREncoding(jobs, resources, random);
     }
 
-
-    protected override PWREncoding CreateSolution() {
-      return Apply(JobsParameter.ActualValue.Value, ResourcesParameter.ActualValue.Value, Random);
+    protected override IScheduleEncoding CreateSolution() {
+      return Apply(JobsParameter.ActualValue.Value, ResourcesParameter.ActualValue.Value, RandomParameter.ActualValue);
     }
   }