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

Timestamp:

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

Author:

ascheibe

Message:

#2306 made comparers and initializers consistent

File:

• branches/FitnessLandscapeAnalysis/HeuristicLab.Problems.NK/BinaryVectorComparers/AverageBitBinaryVectorComparer.cs (modified) (2 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);
     }