Changeset 12582 for branches/FitnessLandscapeAnalysis/HeuristicLab.Problems.NK/BinaryVectorComparers

Timestamp:

07/03/15 14:54:28 (10 years ago)

Author:

ascheibe

Message:

#2306 made comparers and initializers consistent

Location:

branches/FitnessLandscapeAnalysis/HeuristicLab.Problems.NK/BinaryVectorComparers

Files:

• AverageBitBinaryVectorComparer.cs (modified) (2 diffs)
• BinaryVectorComparer.cs (deleted)
• IBinaryVectorComparer.cs (modified) (1 diff)
• LexicographicBinaryVectorComparer.cs (modified) (2 diffs)
• MedianBitBinaryVectorComparer.cs (modified) (3 diffs)

branches/FitnessLandscapeAnalysis/HeuristicLab.Problems.NK/BinaryVectorComparers/AverageBitBinaryVectorComparer.cs

@@ -27 +27 @@
 
 namespace HeuristicLab.Problems.NK {
-
   [Item("Average Bit Binary Vector Comparer", "Compares two binary vectors by their average positive bit location")]
   [StorableClass]
-  public sealed class AverageBitBinaryVectorComparer : BinaryVectorComparer {
-
+  public sealed class AverageBitBinaryVectorComparer : Item, IBinaryVectorComparer {
     [StorableConstructor]
     private AverageBitBinaryVectorComparer(bool deserializing) : base(deserializing) { }
     private AverageBitBinaryVectorComparer(AverageBitBinaryVectorComparer original, Cloner cloner)
-      : base(original, cloner) {
-    }
+      : base(original, cloner) { }
     public AverageBitBinaryVectorComparer() { }
     public override IDeepCloneable Clone(Cloner cloner) {
@@ -42 +39 @@
     }
 
-    public static double AverageBit(BinaryVector x) {
+    private static double AverageBit(BinaryVector x) {
       return x.Select((b, i) => new { b, i }).Where(v => v.b).Average(v => v.i);
     }
 
-    public override int Compare(BinaryVector x, BinaryVector y) {
+    public int Compare(BinaryVector x, BinaryVector y) {
       return (AverageBit(x) - AverageBit(y)).CompareTo(0);
     }

branches/FitnessLandscapeAnalysis/HeuristicLab.Problems.NK/BinaryVectorComparers/IBinaryVectorComparer.cs

@@ -25 +25 @@
 
 namespace HeuristicLab.Problems.NK {
-  public interface IBinaryVectorComparer : INamedItem, IComparer<BinaryVector> { }
+  public interface IBinaryVectorComparer : IItem, IComparer<BinaryVector> { }
 }

branches/FitnessLandscapeAnalysis/HeuristicLab.Problems.NK/BinaryVectorComparers/LexicographicBinaryVectorComparer.cs

@@ -27 +27 @@
 
 namespace HeuristicLab.Problems.NK {
-
   [Item("Lexicographic Binary Vector Comparer", "Compares two binary vectors lexicographically")]
   [StorableClass]
-  public sealed class LexicographicBinaryVectorComparer : BinaryVectorComparer {
-
+  public sealed class LexicographicBinaryVectorComparer : Item, IBinaryVectorComparer {
     [StorableConstructor]
     private LexicographicBinaryVectorComparer(bool deserializing) : base(deserializing) { }
     private LexicographicBinaryVectorComparer(LexicographicBinaryVectorComparer original, Cloner cloner)
-      : base(original, cloner) {
-    }
+      : base(original, cloner) { }
     public LexicographicBinaryVectorComparer() { }
     public override IDeepCloneable Clone(Cloner cloner) {
@@ -42 +39 @@
     }
 
-    public override int Compare(BinaryVector x, BinaryVector y) {
+    public int Compare(BinaryVector x, BinaryVector y) {
       for (int i = 0; i < Math.Min(x.Length, y.Length); i++) {
         if (!x[i] && y[i])

branches/FitnessLandscapeAnalysis/HeuristicLab.Problems.NK/BinaryVectorComparers/MedianBitBinaryVectorComparer.cs

@@ -27 +27 @@
 
 namespace HeuristicLab.Problems.NK {
-
   [Item("Median Bit Binary Vector Comparer", "Compares two binary vectors by the median positive bit location")]
   [StorableClass]
-  public sealed class MedianBitBinaryVectorComparer : BinaryVectorComparer {
-
+  public sealed class MedianBitBinaryVectorComparer : Item, IBinaryVectorComparer {
     [StorableConstructor]
     private MedianBitBinaryVectorComparer(bool deserializing) : base(deserializing) { }
     private MedianBitBinaryVectorComparer(MedianBitBinaryVectorComparer original, Cloner cloner)
-      : base(original, cloner) {
-    }
+      : base(original, cloner) { }
     public MedianBitBinaryVectorComparer() { }
     public override IDeepCloneable Clone(Cloner cloner) {
@@ -42 +39 @@
     }
 
-    public static int MedianBit(BinaryVector x) {
+    private static int MedianBit(BinaryVector x) {
       var activeIndices = x.Select((b, i) => new { b, i }).Where(v => v.b).ToList();
       if (activeIndices.Count > 0)
@@ -49 +46 @@
         return 0;
     }
-    public override int Compare(BinaryVector x, BinaryVector y) {
+
+    public int Compare(BinaryVector x, BinaryVector y) {
       return MedianBit(x) - MedianBit(y);
     }