Changeset 3231 for trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Permutation.cs

Timestamp:

03/29/10 17:53:12 (14 years ago)

Author:

abeham

Message:

Added a permutation type property specifying whether it's a relative (directed or undirected) or absolute permutation #889

File:

• trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Permutation.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Encodings.PermutationEncoding/3.3/Permutation.cs

@@ -25 +25 @@
 
 namespace HeuristicLab.Encodings.PermutationEncoding {
+  [Item("Permutation", "Represents a permutation of integer values.")]
   [StorableClass]
-  [Item("Permutation", "Represents a permutation of integer values.")]
   public class Permutation : IntArray {
-    public Permutation() : base() { }
-    public Permutation(int length)
+    [Storable]
+    private PermutationTypes permutationType;
+    /// <summary>
+    /// Gets the type of the permutation (see <see cref="PermutationType"/>).
+    /// </summary>
+    public PermutationTypes PermutationType {
+      get { return permutationType; }
+    }
+
+    public Permutation() : base() {
+      permutationType = PermutationTypes.RelativeUndirected;
+    }
+    public Permutation(PermutationTypes type) : base() {
+      permutationType = type;
+    }
+
+    public Permutation(PermutationTypes type, int length)
       : base(length) {
       for (int i = 0; i < length; i++)
         this[i] = i;
+      permutationType = type;
     }
-    public Permutation(int length, IRandom random)
-      : this(length) {
+    public Permutation(PermutationTypes type, int length, IRandom random)
+      : this(type, length) {
       Randomize(random);
     }
-    public Permutation(int[] elements) : base(elements) { }
-    public Permutation(IntArray elements)
-      : this(elements.Length) {
+    public Permutation(PermutationTypes type, int[] elements) : base(elements) {
+      permutationType = type;
+    }
+    public Permutation(PermutationTypes type, IntArray elements) : this(type, elements.Length) {
       for (int i = 0; i < array.Length; i++)
         array[i] = elements[i];
@@ -46 +63 @@
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      Permutation clone = new Permutation(array);
+      Permutation clone = new Permutation(permutationType, array);
       cloner.RegisterClonedObject(this, clone);
       return clone;