Changeset 3054 for trunk/sources/HeuristicLab.Encodings.PermutationEncoding

Timestamp:

03/16/10 04:24:01 (15 years ago)

Author:

swagner

Message:

Refactored classes of HeuristicLab.Data and implemented encoding specific data classes (#909)

File:

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

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

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Text;
-using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
@@ -31 +28 @@
   [Item("Permutation", "Represents a permutation of integer values.")]
   [Creatable("Test")]
-  public sealed class Permutation : ValueTypeArray<int>, IStringConvertibleArray {
+  public class Permutation : IntArray {
     public Permutation() : base() { }
     public Permutation(int length)
@@ -42 +39 @@
       Randomize(random);
     }
-    public Permutation(int[] elements)
-      : base(elements) {
+    public Permutation(int[] elements) : base(elements) { }
+    public Permutation(IntArray elements)
+      : this(elements.Length) {
+      for (int i = 0; i < array.Length; i++)
+        array[i] = elements[i];
     }
-    private Permutation(Permutation elements) : base(elements) { }
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      Permutation clone = new Permutation(this);
+      Permutation clone = new Permutation(array);
       cloner.RegisterClonedObject(this, clone);
       return clone;
     }
 
-    public bool Validate() {
+    public virtual bool Validate() {
       bool[] values = new bool[Length];
       int value;
@@ -68 +67 @@
     }
 
-    public void Randomize(IRandom random, int startIndex, int length) {  // Knuth shuffle
-      int index1, index2;
-      int val;
-      for (int i = length - 1; i > 0; i--) {
-        index1 = startIndex + i;
-        index2 = startIndex + random.Next(i + 1);
-        if (index1 != index2) {
-          val = this[index1];
-          this[index1] = this[index2];
-          this[index2] = val;
+    public virtual void Randomize(IRandom random, int startIndex, int length) {
+      if (length > 1) {
+        // Knuth shuffle
+        int index1, index2;
+        int val;
+        for (int i = length - 1; i > 0; i--) {
+          index1 = startIndex + i;
+          index2 = startIndex + random.Next(i + 1);
+          if (index1 != index2) {
+            val = array[index1];
+            array[index1] = array[index2];
+            array[index2] = val;
+          }
         }
+        OnReset();
       }
     }
@@ -85 +88 @@
     }
 
-    public int GetCircular(int position) {
+    public virtual int GetCircular(int position) {
       if (position >= Length) position = position % Length;
       while (position < 0) position += Length;
       return this[position];
     }
-
-    #region IStringConvertibleArrayData Members
-    int IStringConvertibleArray.Length {
-      get { return Length; }
-      set { Length = value; }
-    }
-
-    bool IStringConvertibleArray.Validate(string value, out string errorMessage) {
-      int val;
-      bool valid = int.TryParse(value, out val);
-      errorMessage = string.Empty;
-      if (!valid) {
-        StringBuilder sb = new StringBuilder();
-        sb.Append("Invalid Value (Valid Value Format: \"");
-        sb.Append(FormatPatterns.GetIntFormatPattern());
-        sb.Append("\")");
-        errorMessage = sb.ToString();
-      }
-      return valid;
-    }
-    string IStringConvertibleArray.GetValue(int index) {
-      return this[index].ToString();
-    }
-    bool IStringConvertibleArray.SetValue(string value, int index) {
-      int val;
-      if (int.TryParse(value, out val)) {
-        this[index] = val;
-        return true;
-      } else {
-        return false;
-      }
-    }
-    #endregion
   }
 }