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

Timestamp:

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

Author:

ascheibe

Message:

#2306 made comparers and initializers consistent

Location:

branches/FitnessLandscapeAnalysis/HeuristicLab.Problems.NK/InteractionInitializers

Files:

• IInteractionInitializer.cs (modified) (1 diff)
• IncreasingBlockSizeInteractionsInitializer.cs (modified) (2 diffs)
• LimitedRandomInteractionsInitializer.cs (modified) (4 diffs)
• RandomInteractionsInitializer.cs (modified) (2 diffs)
• SortedRandomInteractionsInitializer.cs (modified) (4 diffs)

branches/FitnessLandscapeAnalysis/HeuristicLab.Problems.NK/InteractionInitializers/IInteractionInitializer.cs

@@ -24 +24 @@
 
 namespace HeuristicLab.Problems.NK {
-  public interface IInteractionInitializer : INamedItem {
+  public interface IInteractionInitializer : IItem {
     BoolMatrix InitializeInterations(int length, int nComponents, int nInteractions, IRandom random);
   }

branches/FitnessLandscapeAnalysis/HeuristicLab.Problems.NK/InteractionInitializers/IncreasingBlockSizeInteractionsInitializer.cs

@@ -29 +29 @@
 
 namespace HeuristicLab.Problems.NK {
-
   [Item("IncreasingBlockSizeInteractionsInitializer", "Randomly assignes interactions across all bits but makes sure that different numbers of ineractions are applied to different bits.")]
   [StorableClass]
-  public class IncreasingBlockSizeInteractionsInitializer : ParameterizedNamedItem, IInteractionInitializer {
-
+  public sealed class IncreasingBlockSizeInteractionsInitializer : Item, IInteractionInitializer {
     [StorableConstructor]
-    protected IncreasingBlockSizeInteractionsInitializer(bool serializing) : base(serializing) { }
-    protected IncreasingBlockSizeInteractionsInitializer(IncreasingBlockSizeInteractionsInitializer original, Cloner cloner) : base(original, cloner) { }
-    public IncreasingBlockSizeInteractionsInitializer() {
-    }
-
-
+    private IncreasingBlockSizeInteractionsInitializer(bool serializing) : base(serializing) { }
+    private IncreasingBlockSizeInteractionsInitializer(IncreasingBlockSizeInteractionsInitializer original, Cloner cloner) : base(original, cloner) { }
+    public IncreasingBlockSizeInteractionsInitializer() { }
     public override IDeepCloneable Clone(Cloner cloner) {
       return new IncreasingBlockSizeInteractionsInitializer(this, cloner);
     }
 
-    #region IInteractionInitializer Members
     public BoolMatrix InitializeInterations(int length, int nComponents, int nInteractions, IRandom random) {
       Dictionary<int, int> bitInteractionCounts = new Dictionary<int, int>();
@@ -77 +71 @@
       return m;
     }
-    #endregion
   }
 }

branches/FitnessLandscapeAnalysis/HeuristicLab.Problems.NK/InteractionInitializers/LimitedRandomInteractionsInitializer.cs

@@ -29 +29 @@
 
 namespace HeuristicLab.Problems.NK {
-
   [Item("LimitedRandomInteractionsInitializer", "Randomly assignes interactions across bits in the vicinity of each other respecting the maximum distances if possible.")]
   [StorableClass]
-  public class LimitedRandomInteractionsInitializer : ParameterizedNamedItem, IInteractionInitializer {
-
+  public sealed class LimitedRandomInteractionsInitializer : ParameterizedNamedItem, IInteractionInitializer {
     private class Bounds {
       public readonly int Min;
@@ -53 +51 @@
     }
 
+    [StorableConstructor]
+    private LimitedRandomInteractionsInitializer(bool serializing) : base(serializing) { }
+    private LimitedRandomInteractionsInitializer(LimitedRandomInteractionsInitializer original, Cloner cloner) : base(original, cloner) { }
+    public LimitedRandomInteractionsInitializer() {
+      Parameters.Add(new ValueParameter<IntValue>("MaximumDistance", "Maximum distance of interactions in bits or 0 for unlimited"));
+      Parameters.Add(new ValueParameter<DoubleValue>("MaximumDistanceRatio", "Maximum distance of interactions as ratio of the total length or 0 for unlimited"));
+    }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new LimitedRandomInteractionsInitializer(this, cloner);
+    }
+
     private int MaximumDistance(int length, int nInteractions) {
       int maxBitDist = MaximumDistanceParameter.Value.Value;
@@ -64 +74 @@
     }
 
-    [StorableConstructor]
-    protected LimitedRandomInteractionsInitializer(bool serializing) : base(serializing) { }
-    protected LimitedRandomInteractionsInitializer(LimitedRandomInteractionsInitializer original, Cloner cloner) : base(original, cloner) { }
-    public LimitedRandomInteractionsInitializer() {
-      Parameters.Add(new ValueParameter<IntValue>("MaximumDistance", "Maximum distance of interactions in bits or 0 for unlimited"));
-      Parameters.Add(new ValueParameter<DoubleValue>("MaximumDistanceRatio", "Maximum distance of interactions as ratio of the total length or 0 for unlimited"));
-    }
-
-    public override IDeepCloneable Clone(Cloner cloner) {
-      return new LimitedRandomInteractionsInitializer(this, cloner);
-    }
-
-    #region IInteractionInitializer Members
     public BoolMatrix InitializeInterations(int length, int nComponents, int nInteractions, IRandom random) {
       BoolMatrix m = new BoolMatrix(length, nComponents);
@@ -97 +94 @@
       return m;
     }
-    #endregion
   }
 }

branches/FitnessLandscapeAnalysis/HeuristicLab.Problems.NK/InteractionInitializers/RandomInteractionsInitializer.cs

@@ -27 +27 @@
 
 namespace HeuristicLab.Problems.NK {
-
   [Item("RandomInteractionsInitializer", "Randomly assignes interactions across all bits")]
   [StorableClass]
-  public class RandomInteractionsInitializer : NamedItem, IInteractionInitializer {
-
-    public override bool CanChangeName { get { return false; } }
-    public override bool CanChangeDescription { get { return false; } }
-
-
+  public sealed class RandomInteractionsInitializer : Item, IInteractionInitializer {
     [StorableConstructor]
-    protected RandomInteractionsInitializer(bool serializing) : base(serializing) { }
-    protected RandomInteractionsInitializer(RandomInteractionsInitializer original, Cloner cloner) : base(original, cloner) { }
-    public RandomInteractionsInitializer() {
-      name = ItemName;
-      description = ItemDescription;
-    }
+    private RandomInteractionsInitializer(bool serializing) : base(serializing) { }
+    private RandomInteractionsInitializer(RandomInteractionsInitializer original, Cloner cloner) : base(original, cloner) { }
+    public RandomInteractionsInitializer() { }
     public override IDeepCloneable Clone(Cloner cloner) {
       return new RandomInteractionsInitializer(this, cloner);
     }
 
-    #region IInteractionInitializer Members
     public BoolMatrix InitializeInterations(int length, int nComponents, int nInteractions, IRandom random) {
       BoolMatrix m = new BoolMatrix(length, nComponents);
@@ -65 +55 @@
       return m;
     }
-    #endregion
   }
 }

branches/FitnessLandscapeAnalysis/HeuristicLab.Problems.NK/InteractionInitializers/SortedRandomInteractionsInitializer.cs

@@ -30 +30 @@
 
 namespace HeuristicLab.Problems.NK {
-
   [Item("SortedRandomInteractionsInitializer", "Randomly assigns interactions across all bits and sorts components according to bit affinity.")]
   [StorableClass]
-  public class SortedRandomInteractionsInitializer : ParameterizedNamedItem, IInteractionInitializer {
+  public sealed class SortedRandomInteractionsInitializer : ParameterizedNamedItem, IInteractionInitializer {
     public IConstrainedValueParameter<IBinaryVectorComparer> ComparerParameter {
       get { return (IConstrainedValueParameter<IBinaryVectorComparer>)Parameters["Comparer"]; }
@@ -42 +41 @@
 
     [StorableConstructor]
-    protected SortedRandomInteractionsInitializer(bool serializing) : base(serializing) { }
-    protected SortedRandomInteractionsInitializer(SortedRandomInteractionsInitializer original, Cloner cloner) : base(original, cloner) { }
+    private SortedRandomInteractionsInitializer(bool serializing) : base(serializing) { }
+    private SortedRandomInteractionsInitializer(SortedRandomInteractionsInitializer original, Cloner cloner) : base(original, cloner) { }
     public SortedRandomInteractionsInitializer() {
       Parameters.Add(new ConstrainedValueParameter<IBinaryVectorComparer>("Comparer", "Comparison for sorting of component functions."));
@@ -59 +58 @@
     }
 
-    #region IInteractionInitializer Members
     public BoolMatrix InitializeInterations(int length, int nComponents, int nInteractions, IRandom random) {
       BinaryVector[] components = Enumerable.Range(0, nComponents).Select(i => new BinaryVector(length)).ToArray();
@@ -83 +81 @@
       return m;
     }
-    #endregion
   }
 }