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

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/WeightInitializers

Files:

• EqualWeightsInitializer.cs (modified) (1 diff)
• ExponentialDistributionWeightsInitializer.cs (modified) (5 diffs)
• ExponentialWeightsInitializer.cs (modified) (2 diffs)
• IWeightsInitializer.cs (modified) (1 diff)
• LinearWeightsInitializer.cs (modified) (2 diffs)
• ReverseExponentialWeightsInitializer.cs (modified) (2 diffs)
• ReverseLinearWeightsInitializer.cs (modified) (2 diffs)

branches/FitnessLandscapeAnalysis/HeuristicLab.Problems.NK/WeightInitializers/EqualWeightsInitializer.cs

@@ -25 +25 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Problems.NK.WeightInitializers {
-
+namespace HeuristicLab.Problems.NK {
   [Item("EqualWeightsInitializer", "Initializes all weights to 1.0.")]
   [StorableClass]
-  public class EqualWeightsInitializer : NamedItem, IWeightsInitializer {
-
-    public override bool CanChangeName { get { return false; } }
-    public override bool CanChangeDescription { get { return false; } }
-
+  public sealed class EqualWeightsInitializer : Item, IWeightsInitializer {
     [StorableConstructor]
-    protected EqualWeightsInitializer(bool deserializing) : base(deserializing) { }
-    protected EqualWeightsInitializer(EqualWeightsInitializer original, Cloner cloner)
-      : base(original, cloner) {
-    }
-    public EqualWeightsInitializer() {
-      name = ItemName;
-      description = ItemDescription;
-    }
+    private EqualWeightsInitializer(bool deserializing) : base(deserializing) { }
+    private EqualWeightsInitializer(EqualWeightsInitializer original, Cloner cloner)
+      : base(original, cloner) { }
+    public EqualWeightsInitializer() { }
     public override IDeepCloneable Clone(Cloner cloner) {
       return new EqualWeightsInitializer(this, cloner);
     }
 
-    #region IWeightsInitializer Members
-
     public IEnumerable<double> GetWeights(int nComponents) {
       return new[] { 1.0 };
     }
-
-    #endregion
   }
-
 }

branches/FitnessLandscapeAnalysis/HeuristicLab.Problems.NK/WeightInitializers/ExponentialDistributionWeightsInitializer.cs

@@ -28 +28 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Problems.NK.WeightInitializers {
-
+namespace HeuristicLab.Problems.NK {
   [Item("ExponentialDistributionWeightsInitializer", "Assigns exponentially decreasing weights using the rate parameter lambda.")]
   [StorableClass]
-  public class ExponentialDistributionWeightsInitializer : ParameterizedNamedItem, IWeightsInitializer {
-
-    public override bool CanChangeName { get { return false; } }
-    public override bool CanChangeDescription { get { return false; } }
+  public sealed class ExponentialDistributionWeightsInitializer : ParameterizedNamedItem, IWeightsInitializer {
     public IValueParameter<DoubleValue> LambdaParameter {
       get { return (IValueParameter<DoubleValue>)Parameters["Lambda"]; }
@@ -41 +37 @@
 
     [StorableConstructor]
-    protected ExponentialDistributionWeightsInitializer(bool deserializing) : base(deserializing) { }
-    protected ExponentialDistributionWeightsInitializer(ExponentialDistributionWeightsInitializer original, Cloner cloner)
+    private ExponentialDistributionWeightsInitializer(bool deserializing) : base(deserializing) { }
+    private ExponentialDistributionWeightsInitializer(ExponentialDistributionWeightsInitializer original, Cloner cloner)
       : base(original, cloner) {
     }
@@ -52 +48 @@
     }
 
-    public static double f(double x, double lambda) {
+    private static double f(double x, double lambda) {
       if (x < 0.0)
         return 0.0;
@@ -58 +54 @@
     }
 
-    #region IWeightsInitializer Members
     public IEnumerable<double> GetWeights(int nComponents) {
       double lambda = LambdaParameter.Value.Value;
@@ -64 +59 @@
         yield return f(i, lambda);
     }
-    #endregion
   }
-
 }

branches/FitnessLandscapeAnalysis/HeuristicLab.Problems.NK/WeightInitializers/ExponentialWeightsInitializer.cs

@@ -26 +26 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Problems.NK.WeightInitializers {
-
+namespace HeuristicLab.Problems.NK {
   [Item("ExponentialWeightsInitializer", "Assigns exponentially increasing weights.")]
   [StorableClass]
-  public class ExponentialWeightsInitializer : NamedItem, IWeightsInitializer {
-
-    public override bool CanChangeName { get { return false; } }
-    public override bool CanChangeDescription { get { return false; } }
-
+  public sealed class ExponentialWeightsInitializer : Item, IWeightsInitializer {
     [StorableConstructor]
-    protected ExponentialWeightsInitializer(bool deserializing) : base(deserializing) { }
-    protected ExponentialWeightsInitializer(ExponentialWeightsInitializer original, Cloner cloner)
+    private ExponentialWeightsInitializer(bool deserializing) : base(deserializing) { }
+    private ExponentialWeightsInitializer(ExponentialWeightsInitializer original, Cloner cloner)
       : base(original, cloner) {
     }
-    public ExponentialWeightsInitializer() {
-      name = ItemName;
-      description = ItemDescription;
-    }
+    public ExponentialWeightsInitializer() { }
     public override IDeepCloneable Clone(Cloner cloner) {
       return new ExponentialWeightsInitializer(this, cloner);
     }
-
-    #region IWeightsInitializer Members
 
     public IEnumerable<double> GetWeights(int nComponents) {
@@ -54 +44 @@
         yield return Math.Pow(2, i);
     }
-
-    #endregion
   }
-
 }

branches/FitnessLandscapeAnalysis/HeuristicLab.Problems.NK/WeightInitializers/IWeightsInitializer.cs

@@ -24 +24 @@
 
 namespace HeuristicLab.Problems.NK {
-  public interface IWeightsInitializer : INamedItem {
+  public interface IWeightsInitializer : IItem {
     IEnumerable<double> GetWeights(int nComponents);
   }

branches/FitnessLandscapeAnalysis/HeuristicLab.Problems.NK/WeightInitializers/LinearWeightsInitializer.cs

@@ -25 +25 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Problems.NK.WeightInitializers {
-
+namespace HeuristicLab.Problems.NK {
   [Item("LinearWeightsInitializer", "Assigns linear increasing weights.")]
   [StorableClass]
-  public class LinearWeightsInitializer : NamedItem, IWeightsInitializer {
-
-    public override bool CanChangeName { get { return false; } }
-    public override bool CanChangeDescription { get { return false; } }
-
+  public sealed class LinearWeightsInitializer : Item, IWeightsInitializer {
     [StorableConstructor]
-    protected LinearWeightsInitializer(bool deserializing) : base(deserializing) { }
-    protected LinearWeightsInitializer(LinearWeightsInitializer original, Cloner cloner)
+    private LinearWeightsInitializer(bool deserializing) : base(deserializing) { }
+    private LinearWeightsInitializer(LinearWeightsInitializer original, Cloner cloner)
       : base(original, cloner) {
     }
-    public LinearWeightsInitializer() {
-      name = ItemName;
-      description = ItemDescription;
-    }
+    public LinearWeightsInitializer() { }
     public override IDeepCloneable Clone(Cloner cloner) {
       return new LinearWeightsInitializer(this, cloner);
     }
-
-    #region IWeightsInitializer Members
 
     public IEnumerable<double> GetWeights(int nComponents) {
@@ -53 +43 @@
         yield return i;
     }
-
-    #endregion
   }
-
 }

branches/FitnessLandscapeAnalysis/HeuristicLab.Problems.NK/WeightInitializers/ReverseExponentialWeightsInitializer.cs

@@ -26 +26 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Problems.NK.WeightInitializers {
-
+namespace HeuristicLab.Problems.NK {
   [Item("ReverseExponentialWeightsInitializer", "Assigns exponentially decreasing weights.")]
   [StorableClass]
-  public class ReverseExponentialWeightsInitializer : NamedItem, IWeightsInitializer {
-
-    public override bool CanChangeName { get { return false; } }
-    public override bool CanChangeDescription { get { return false; } }
-
+  public sealed class ReverseExponentialWeightsInitializer : Item, IWeightsInitializer {
     [StorableConstructor]
-    protected ReverseExponentialWeightsInitializer(bool deserializing) : base(deserializing) { }
-    protected ReverseExponentialWeightsInitializer(ReverseExponentialWeightsInitializer original, Cloner cloner)
+    private ReverseExponentialWeightsInitializer(bool deserializing) : base(deserializing) { }
+    private ReverseExponentialWeightsInitializer(ReverseExponentialWeightsInitializer original, Cloner cloner)
       : base(original, cloner) {
     }
-    public ReverseExponentialWeightsInitializer() {
-      name = ItemName;
-      description = ItemDescription;
-    }
+    public ReverseExponentialWeightsInitializer() { }
     public override IDeepCloneable Clone(Cloner cloner) {
       return new ReverseExponentialWeightsInitializer(this, cloner);
     }
-
-    #region IWeightsInitializer Members
 
     public IEnumerable<double> GetWeights(int nComponents) {
@@ -54 +44 @@
         yield return Math.Pow(2, i);
     }
-
-    #endregion
   }
-
 }

branches/FitnessLandscapeAnalysis/HeuristicLab.Problems.NK/WeightInitializers/ReverseLinearWeightsInitializer.cs

@@ -25 +25 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Problems.NK.WeightInitializers {
-
+namespace HeuristicLab.Problems.NK {
   [Item("ReverseLinearWeightsInitializer", "Assigns exponentially decreasing weights.")]
   [StorableClass]
-  public class ReverseLinearWeightsInitializer : NamedItem, IWeightsInitializer {
-
-    public override bool CanChangeName { get { return false; } }
-    public override bool CanChangeDescription { get { return false; } }
-
+  public sealed class ReverseLinearWeightsInitializer : Item, IWeightsInitializer {
     [StorableConstructor]
-    protected ReverseLinearWeightsInitializer(bool deserializing) : base(deserializing) { }
-    protected ReverseLinearWeightsInitializer(ReverseLinearWeightsInitializer original, Cloner cloner)
+    private ReverseLinearWeightsInitializer(bool deserializing) : base(deserializing) { }
+    private ReverseLinearWeightsInitializer(ReverseLinearWeightsInitializer original, Cloner cloner)
       : base(original, cloner) {
     }
-    public ReverseLinearWeightsInitializer() {
-      name = ItemName;
-      description = ItemDescription;
-    }
+    public ReverseLinearWeightsInitializer() { }
     public override IDeepCloneable Clone(Cloner cloner) {
       return new ReverseLinearWeightsInitializer(this, cloner);
     }
-
-    #region IWeightsInitializer Members
 
     public IEnumerable<double> GetWeights(int nComponents) {
@@ -53 +43 @@
         yield return i;
     }
-
-    #endregion
   }
-
 }