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

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

Files:

• PWRCrossover.cs (modified) (2 diffs)
• PWRGOXCrossover.cs (modified) (3 diffs)
• PWRPPXCrossover.cs (modified) (2 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 @@
     }
 
-
   }
 }