Changeset 4722 for trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Crossovers

Timestamp:

11/06/10 01:56:04 (14 years ago)

Author:

swagner

Message:

Merged cloning refactoring branch back into trunk (#922)

Location:

trunk/sources

Files:

• . (modified) (1 prop)
• HeuristicLab.Encodings.PermutationEncoding/3.3/Crossovers/CosaCrossover.cs (modified) (2 diffs)
• HeuristicLab.Encodings.PermutationEncoding/3.3/Crossovers/CyclicCrossover.cs (modified) (2 diffs)
• HeuristicLab.Encodings.PermutationEncoding/3.3/Crossovers/CyclicCrossover2.cs (modified) (2 diffs)
• HeuristicLab.Encodings.PermutationEncoding/3.3/Crossovers/EdgeRecombinationCrossover.cs (modified) (2 diffs)
• HeuristicLab.Encodings.PermutationEncoding/3.3/Crossovers/MaximalPreservativeCrossover.cs (modified) (2 diffs)
• HeuristicLab.Encodings.PermutationEncoding/3.3/Crossovers/MultiPermutationCrossover.cs (modified) (3 diffs)
• HeuristicLab.Encodings.PermutationEncoding/3.3/Crossovers/OrderBasedCrossover.cs (modified) (2 diffs)
• HeuristicLab.Encodings.PermutationEncoding/3.3/Crossovers/OrderCrossover.cs (modified) (2 diffs)
• HeuristicLab.Encodings.PermutationEncoding/3.3/Crossovers/OrderCrossover2.cs (modified) (2 diffs)
• HeuristicLab.Encodings.PermutationEncoding/3.3/Crossovers/PartiallyMatchedCrossover.cs (modified) (2 diffs)
• HeuristicLab.Encodings.PermutationEncoding/3.3/Crossovers/PositionBasedCrossover.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Crossovers/CosaCrossover.cs

@@ -21 +21 @@
 
 using System;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -37 +38 @@
   [StorableClass]
   public class CosaCrossover : PermutationCrossover {
+    [StorableConstructor]
+    protected CosaCrossover(bool deserializing) : base(deserializing) { }
+    protected CosaCrossover(CosaCrossover original, Cloner cloner) : base(original, cloner) { }
+    public CosaCrossover() : base() { }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new CosaCrossover(this, cloner);
+    }
+
     /// <summary>
     /// The operator actually performs a 2-opt mutation on the first parent, but it uses the second parent to determine which new edge should be inserted.

trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Crossovers/CyclicCrossover.cs

@@ -21 +21 @@
 
 using System;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -34 +35 @@
   [StorableClass]
   public class CyclicCrossover : PermutationCrossover {
+    [StorableConstructor]
+    protected CyclicCrossover(bool deserializing) : base(deserializing) { }
+    protected CyclicCrossover(CyclicCrossover original, Cloner cloner) : base(original, cloner) { }
+    public CyclicCrossover() : base() { }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new CyclicCrossover(this, cloner);
+    }
+
     /// <summary>
     /// Performs the cyclic crossover on <paramref name="parent1"/> and <paramref name="parent2"/>.

trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Crossovers/CyclicCrossover2.cs

@@ -21 +21 @@
 
 using System;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -35 +36 @@
   [StorableClass]
   public class CyclicCrossover2 : PermutationCrossover {
+    [StorableConstructor]
+    protected CyclicCrossover2(bool deserializing) : base(deserializing) { }
+    protected CyclicCrossover2(CyclicCrossover2 original, Cloner cloner) : base(original, cloner) { }
+    public CyclicCrossover2() : base() { }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new CyclicCrossover2(this, cloner);
+    }
+
     /// <summary>
     /// Performs a variant of the cyclic crossover on <paramref name="parent1"/> and <paramref name="parent2"/>.

trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Crossovers/EdgeRecombinationCrossover.cs

@@ -21 +21 @@
 
 using System;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -37 +38 @@
   [StorableClass]
   public class EdgeRecombinationCrossover : PermutationCrossover {
+    [StorableConstructor]
+    protected EdgeRecombinationCrossover(bool deserializing) : base(deserializing) { }
+    protected EdgeRecombinationCrossover(EdgeRecombinationCrossover original, Cloner cloner) : base(original, cloner) { }
+    public EdgeRecombinationCrossover() : base() { }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new EdgeRecombinationCrossover(this, cloner);
+    }
+
     /// <summary>
     /// Performs a cross over permutation of <paramref name="parent1"/> and <paramref name="2"/>

trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Crossovers/MaximalPreservativeCrossover.cs

@@ -21 +21 @@
 
 using System;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -37 +38 @@
   [StorableClass]
   public class MaximalPreservativeCrossover : PermutationCrossover {
+    [StorableConstructor]
+    protected MaximalPreservativeCrossover(bool deserializing) : base(deserializing) { }
+    protected MaximalPreservativeCrossover(MaximalPreservativeCrossover original, Cloner cloner) : base(original, cloner) { }
+    public MaximalPreservativeCrossover() : base() { }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new MaximalPreservativeCrossover(this, cloner);
+    }
+
     /// <summary>
     /// Performs the maximal preservative crossover on <paramref name="parent1"/> and <paramref name="parent2"/>

trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Crossovers/MultiPermutationCrossover.cs

@@ -23 +23 @@
 using System.Linq;
 using HeuristicLab.Collections;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Operators;
@@ -50 +51 @@
 
     [StorableConstructor]
-    private MultiPermutationCrossover(bool deserializing) : base(deserializing) { }
+    protected MultiPermutationCrossover(bool deserializing) : base(deserializing) { }
+    protected MultiPermutationCrossover(MultiPermutationCrossover original, Cloner cloner) : base(original, cloner) { }
     public MultiPermutationCrossover()
       : base() {
@@ -62 +64 @@
           Operators.Add((IPermutationCrossover)Activator.CreateInstance(type), true);
       }
+    }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new MultiPermutationCrossover(this, cloner);
     }
 

trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Crossovers/OrderBasedCrossover.cs

@@ -21 +21 @@
 
 using System;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -37 +38 @@
   [StorableClass]
   public class OrderBasedCrossover : PermutationCrossover {
+    [StorableConstructor]
+    protected OrderBasedCrossover(bool deserializing) : base(deserializing) { }
+    protected OrderBasedCrossover(OrderBasedCrossover original, Cloner cloner) : base(original, cloner) { }
+    public OrderBasedCrossover() : base() { }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new OrderBasedCrossover(this, cloner);
+    }
+
     /// <summary>
     /// Performs a cross over permutation of <paramref name="parent1"/> and <paramref name="parent2"/> by

trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Crossovers/OrderCrossover.cs

@@ -21 +21 @@
 
 using System;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -37 +38 @@
   [StorableClass]
   public class OrderCrossover : PermutationCrossover {
+    [StorableConstructor]
+    protected OrderCrossover(bool deserializing) : base(deserializing) { }
+    protected OrderCrossover(OrderCrossover original, Cloner cloner) : base(original, cloner) { }
+    public OrderCrossover() : base() { }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new OrderCrossover(this, cloner);
+    }
+
     /// <summary>
     /// Performs the order crossover of two permutations.

trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Crossovers/OrderCrossover2.cs

@@ -21 +21 @@
 
 using System;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -36 +37 @@
   [StorableClass]
   public class OrderCrossover2 : PermutationCrossover {
+    [StorableConstructor]
+    protected OrderCrossover2(bool deserializing) : base(deserializing) { }
+    protected OrderCrossover2(OrderCrossover2 original, Cloner cloner) : base(original, cloner) { }
+    public OrderCrossover2() : base() { }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new OrderCrossover2(this, cloner);
+    }
+
     /// <summary>
     /// Performs a slight variation of the order crossover of two permutations.

trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Crossovers/PartiallyMatchedCrossover.cs

@@ -21 +21 @@
 
 using System;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -36 +37 @@
   [StorableClass]
   public class PartiallyMatchedCrossover : PermutationCrossover {
+    [StorableConstructor]
+    protected PartiallyMatchedCrossover(bool deserializing) : base(deserializing) { }
+    protected PartiallyMatchedCrossover(PartiallyMatchedCrossover original, Cloner cloner) : base(original, cloner) { }
+    public PartiallyMatchedCrossover() : base() { }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new PartiallyMatchedCrossover(this, cloner);
+    }
+
     /// <summary>
     /// Performs the partially matched crossover on <paramref name="parent1"/> and <paramref name="parent2"/>.

trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Crossovers/PositionBasedCrossover.cs

@@ -21 +21 @@
 
 using System;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -34 +35 @@
   [StorableClass]
   public class PositionBasedCrossover : PermutationCrossover {
+    [StorableConstructor]
+    protected PositionBasedCrossover(bool deserializing) : base(deserializing) { }
+    protected PositionBasedCrossover(PositionBasedCrossover original, Cloner cloner) : base(original, cloner) { }
+    public PositionBasedCrossover() : base() { }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new PositionBasedCrossover(this, cloner);
+    }
+
     /// <summary>
     /// Performs a cross over permutation of <paramref name="parent1"/> and <paramref name="parent2"/>