Changeset 8887 for trunk/sources/HeuristicLab.Encodings.ScheduleEncoding/3.3/JobSequenceMatrix/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/JobSequenceMatrix/Crossovers

Files:

• JSMCrossover.cs (modified) (2 diffs)
• JSMJOXCrossover.cs (modified) (2 diffs)
• JSMOXCrossover.cs (modified) (1 diff)
• JSMSXXCrossover.cs (modified) (5 diffs)

trunk/sources/HeuristicLab.Encodings.ScheduleEncoding/3.3/JobSequenceMatrix/Crossovers/JSMCrossover.cs

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

trunk/sources/HeuristicLab.Encodings.ScheduleEncoding/3.3/JobSequenceMatrix/Crossovers/JSMJOXCrossover.cs

@@ -30 +30 @@
   [StorableClass]
   public class JSMJOXCrossover : JSMCrossover {
+
     [StorableConstructor]
     protected JSMJOXCrossover(bool deserializing) : base(deserializing) { }
-    protected JSMJOXCrossover(JSMJOXCrossover original, Cloner cloner)
-      : base(original, cloner) {
-    }
+    protected JSMJOXCrossover(JSMJOXCrossover original, Cloner cloner) : base(original, cloner) { }
+    public JSMJOXCrossover() : base() { }
+
     public override IDeepCloneable Clone(Cloner cloner) {
       return new JSMJOXCrossover(this, cloner);
     }
-    public JSMJOXCrossover() : base() { }
-
 
     public static JSMEncoding Apply(IRandom random, JSMEncoding p1, JSMEncoding p2) {
-      JSMEncoding result = new JSMEncoding();
+      var result = new JSMEncoding();
 
       int nrOfResources = p1.JobSequenceMatrix.Count;
@@ -48 +47 @@
 
       //Determine randomly which jobindexes persist
-      BoolArray persist = new BoolArray(nrOfJobs);
+      var persist = new BoolArray(nrOfJobs);
       for (int i = 0; i < persist.Length; i++) {
         persist[i] = random.Next(2) == 1;

trunk/sources/HeuristicLab.Encodings.ScheduleEncoding/3.3/JobSequenceMatrix/Crossovers/JSMOXCrossover.cs

@@ -28 +28 @@
   [StorableClass]
   public class JSMOXCrossover : JSMCrossover {
+
     [StorableConstructor]
     protected JSMOXCrossover(bool deserializing) : base(deserializing) { }
-    protected JSMOXCrossover(JSMOXCrossover original, Cloner cloner)
-      : base(original, cloner) {
-    }
+    protected JSMOXCrossover(JSMOXCrossover original, Cloner cloner) : base(original, cloner) { }
+    public JSMOXCrossover() : base() { }
+
     public override IDeepCloneable Clone(Cloner cloner) {
       return new JSMOXCrossover(this, cloner);
     }
-    public JSMOXCrossover() : base() { }
-
 
     public static JSMEncoding Apply(IRandom random, JSMEncoding parent1, JSMEncoding parent2) {
-      JSMEncoding result = new JSMEncoding();
+      var result = new JSMEncoding();
 
       for (int i = 0; i < parent1.JobSequenceMatrix.Count; i++) {

trunk/sources/HeuristicLab.Encodings.ScheduleEncoding/3.3/JobSequenceMatrix/Crossovers/JSMSXXCrossover.cs

@@ -29 +29 @@
   [StorableClass]
   public class JSMSXXCrossover : JSMCrossover {
+
     [StorableConstructor]
     protected JSMSXXCrossover(bool deserializing) : base(deserializing) { }
-    protected JSMSXXCrossover(JSMSXXCrossover original, Cloner cloner)
-      : base(original, cloner) {
-    }
+    protected JSMSXXCrossover(JSMSXXCrossover original, Cloner cloner) : base(original, cloner) { }
+    public JSMSXXCrossover() : base() { }
+
     public override IDeepCloneable Clone(Cloner cloner) {
       return new JSMSXXCrossover(this, cloner);
     }
-    public JSMSXXCrossover() : base() { }
-
 
     public static JSMEncoding Apply(IRandom random, JSMEncoding parent1, JSMEncoding parent2) {
-      JSMEncoding result = new JSMEncoding();
+      var result = new JSMEncoding();
       int subSequenceLength = random.Next(parent1.JobSequenceMatrix[0].Length);
       for (int i = 0; i < parent1.JobSequenceMatrix.Count; i++) {
-        Permutation p1 = (Permutation)parent1.JobSequenceMatrix[i].Clone();
-        Permutation p2 = (Permutation)parent2.JobSequenceMatrix[i].Clone();
+        var p1 = (Permutation)parent1.JobSequenceMatrix[i].Clone();
+        var p2 = (Permutation)parent2.JobSequenceMatrix[i].Clone();
         FindAndExchangeSubsequences(p1, p2, subSequenceLength);
         result.JobSequenceMatrix.Add(p1);
@@ -51 +50 @@
       return result;
     }
+
     private static void FindAndExchangeSubsequences(Permutation p1, Permutation p2, int subSequenceLength) {
       for (int i = 0; i <= p1.Length - subSequenceLength; i++) {
@@ -63 +63 @@
       }
     }
+
     private static void ExchangeSubsequences(Permutation p1, int index1, Permutation p2, int index2, int subSequenceLength) {
-      Permutation aux = (Permutation)p1.Clone();
+      var aux = (Permutation)p1.Clone();
       for (int i = 0; i < subSequenceLength; i++) {
         p1[i + index1] = p2[i + index2];
@@ -70 +71 @@
       }
     }
+
     private static bool AreEqualSubsequences(int[] ss1, int[] ss2) {
       int counter = 0;
@@ -80 +82 @@
       return counter == ss1.Length;
     }
+
     private static int[] GetSubSequenceAtPosition(Permutation p1, int index, int subSequenceLength) {
-      int[] result = new int[subSequenceLength];
+      var result = new int[subSequenceLength];
       for (int i = 0; i < subSequenceLength; i++)
         result[i] = p1[i + index];