Changeset 12569

Timestamp:

07/02/15 11:02:16 (5 years ago)

Author:

ascheibe

Message:

#2306 fixed typos and some cosmetic changes

Location:

branches/FitnessLandscapeAnalysis/HeuristicLab.Problems.NK

Files:

• BinaryVectorComparers/BinaryVectorComparer.cs (modified) (1 diff)
• BinaryVectorComparers/IBinaryVectorComparer.cs (added)
• HeuristicLab.Problems.NK.csproj (modified) (1 diff)
• InteractionInitializers/LimitedRandomInteractionsInitializer.cs (modified) (3 diffs)
• InteractionInitializers/SortedRandomInteractionsInitializer.cs (modified) (3 diffs)
• NKBitFlipMoveEvaluator.cs (modified) (1 diff)
• NKLandscape.cs (modified) (5 diffs)
• NKMoveEvaluator.cs (modified) (3 diffs)
• Properties/AssemblyInfo.cs.frame (modified) (1 diff)
• WeightInitializers/EqualWeightsInitializer.cs (modified) (1 diff)
• WeightInitializers/ExponentialDistributionWeightsInitializer.cs (modified) (3 diffs)
• WeightInitializers/ExponentialWeightsInitializer.cs (modified) (1 diff)
• WeightInitializers/IWeightsInitializer.cs (modified) (1 diff)
• WeightInitializers/LinearWeightsInitializer.cs (modified) (1 diff)
• WeightInitializers/ReverseExponentialWeightsInitializer.cs (modified) (1 diff)
• WeightInitializers/ReverseLinearWeightsInitializer.cs (modified) (1 diff)

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

@@ -27 +27 @@
 
 namespace HeuristicLab.Problems.NK {
-
-  public interface IBinaryVectorComparer : INamedItem, IComparer<BinaryVector> { }
-
   [StorableClass]
   public abstract class BinaryVectorComparer : NamedItem, IBinaryVectorComparer {

branches/FitnessLandscapeAnalysis/HeuristicLab.Problems.NK/HeuristicLab.Problems.NK.csproj

@@ -158 +158 @@
   <ItemGroup>
     <Compile Include="BinaryVectorComparers\BinaryVectorComparer.cs" />
+    <Compile Include="BinaryVectorComparers\IBinaryVectorComparer.cs" />
     <Compile Include="BinaryVectorComparers\LexicographicBinaryVectorComparer.cs" />
     <Compile Include="BinaryVectorComparers\AverageBitBinaryVectorComparer.cs" />

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

@@ -41 +41 @@
         Max = Math.Max(min, max);
       }
-      public int bounded(int n) {
+      public int Bounded(int n) {
         return Math.Max(Min, Math.Min(Max, n));
       }
     }
 
-    public ValueParameter<IntValue> MaximumDistanceParameter {
-      get { return (ValueParameter<IntValue>)Parameters["MaximumDistance"]; }
+    public IValueParameter<IntValue> MaximumDistanceParameter {
+      get { return (IValueParameter<IntValue>)Parameters["MaximumDistance"]; }
     }
-    public ValueParameter<DoubleValue> MaximumDistanceRatioParameter {
-      get { return (ValueParameter<DoubleValue>)Parameters["MaximumDistanceRatio"]; }
+    public IValueParameter<DoubleValue> MaximumDistanceRatioParameter {
+      get { return (IValueParameter<DoubleValue>)Parameters["MaximumDistanceRatio"]; }
     }
 
@@ -58 +58 @@
       maxBitDist = Math.Min(
         maxBitDist == 0 ? length : maxBitDist,
-        maxDistRatio == 0 ? length : (int)Math.Round(maxDistRatio * length));
+        maxDistRatio.IsAlmost(0.0) ? length : (int)Math.Round(maxDistRatio * length));
       if (maxBitDist * 2 < nInteractions)
         maxBitDist = (int)Math.Ceiling(0.5 * nInteractions);
@@ -83 +83 @@
       var maxBounds = new Bounds(nInteractions, length - 1);
       for (int c = 0; c < m.Columns; c++) {
-        int min = minBounds.bounded(c - maxBitDistance);
-        int max = maxBounds.bounded(c + maxBitDistance);
+        int min = minBounds.Bounded(c - maxBitDistance);
+        int max = maxBounds.Bounded(c + maxBitDistance);
         var indices = Enumerable.Range(min, max - min).ToList();
         indices.Remove(c);

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

@@ -31 +31 @@
 namespace HeuristicLab.Problems.NK {
 
-  [Item("SortedRandomInteractionsInitializer", "Randomly assigned interactions across all bits and sorts components according to bit affinity.")]
+  [Item("SortedRandomInteractionsInitializer", "Randomly assigns interactions across all bits and sorts components according to bit affinity.")]
   [StorableClass]
   public class SortedRandomInteractionsInitializer : ParameterizedNamedItem, IInteractionInitializer {
-
     public IConstrainedValueParameter<IBinaryVectorComparer> ComparerParameter {
       get { return (IConstrainedValueParameter<IBinaryVectorComparer>)Parameters["Comparer"]; }
     }
-
     public IBinaryVectorComparer Comparer {
       get { return ComparerParameter.Value; }
@@ -47 +45 @@
     protected SortedRandomInteractionsInitializer(SortedRandomInteractionsInitializer original, Cloner cloner) : base(original, cloner) { }
     public SortedRandomInteractionsInitializer() {
-      AddComparerParameter();
+      Parameters.Add(new ConstrainedValueParameter<IBinaryVectorComparer>("Comparer", "Comparison for sorting of component functions."));
+      InitializeComparers();
     }
 
-    private void AddComparerParameter() {
-      Parameters.Add(new ConstrainedValueParameter<IBinaryVectorComparer>("Comparer", "Comparison for sorting of component functions"));
+    private void InitializeComparers() {
       foreach (var comparer in ApplicationManager.Manager.GetInstances<IBinaryVectorComparer>())
         ComparerParameter.ValidValues.Add(comparer);
@@ -59 +57 @@
     public override IDeepCloneable Clone(Cloner cloner) {
       return new SortedRandomInteractionsInitializer(this, cloner);
-    }
-
-    [StorableHook(HookType.AfterDeserialization)]
-    private void AfterDeserialization() {
-      try {
-        IBinaryVectorComparer comparer = Comparer;
-      }
-      catch {
-        Parameters.Remove("Comparer");
-        AddComparerParameter();
-      }
     }
 

branches/FitnessLandscapeAnalysis/HeuristicLab.Problems.NK/NKBitFlipMoveEvaluator.cs

@@ -33 +33 @@
   [StorableClass]
   public class NKBitFlipMoveEvaluator : NKMoveEvaluator, IOneBitflipMoveOperator {
-
     public ILookupParameter<OneBitflipMove> OneBitflipMoveParameter {
       get { return (ILookupParameter<OneBitflipMove>)Parameters["OneBitflipMove"]; }
     }
-    public LookupParameter<BinaryVector> MovedBinaryVectorParameter {
-      get { return (LookupParameter<BinaryVector>)Parameters["MovedBinaryVector"]; }
+    public ILookupParameter<BinaryVector> MovedBinaryVectorParameter {
+      get { return (ILookupParameter<BinaryVector>)Parameters["MovedBinaryVector"]; }
     }
 
     [StorableConstructor]
     protected NKBitFlipMoveEvaluator(bool deserializing) : base(deserializing) { }
-
     protected NKBitFlipMoveEvaluator(NKBitFlipMoveEvaluator original, Cloner cloner)
       : base(original, cloner) { }

branches/FitnessLandscapeAnalysis/HeuristicLab.Problems.NK/NKLandscape.cs

@@ -45 +45 @@
 
     #region Parameters
-    public ValueParameter<BoolMatrix> GeneInteractionsParameter {
-      get { return (ValueParameter<BoolMatrix>)Parameters["GeneInteractions"]; }
-    }
-    public ValueParameter<IntValue> InteractionSeedParameter {
-      get { return (ValueParameter<IntValue>)Parameters["InteractionSeed"]; }
-    }
-    public ValueParameter<IntValue> NrOfInteractionsParameter {
-      get { return (ValueParameter<IntValue>)Parameters["NrOfInteractions"]; }
-    }
-    public ValueParameter<IntValue> NrOfFitnessComponentsParameter {
-      get { return (ValueParameter<IntValue>)Parameters["NrOfFitnessComponents"]; }
-    }
-    public ValueParameter<DoubleArray> WeightsParameter {
-      get { return (ValueParameter<DoubleArray>)Parameters["Weights"]; }
+    public IValueParameter<BoolMatrix> GeneInteractionsParameter {
+      get { return (IValueParameter<BoolMatrix>)Parameters["GeneInteractions"]; }
+    }
+    public IValueParameter<IntValue> InteractionSeedParameter {
+      get { return (IValueParameter<IntValue>)Parameters["InteractionSeed"]; }
+    }
+    public IValueParameter<IntValue> NrOfInteractionsParameter {
+      get { return (IValueParameter<IntValue>)Parameters["NrOfInteractions"]; }
+    }
+    public IValueParameter<IntValue> NrOfFitnessComponentsParameter {
+      get { return (IValueParameter<IntValue>)Parameters["NrOfFitnessComponents"]; }
+    }
+    public IValueParameter<DoubleArray> WeightsParameter {
+      get { return (IValueParameter<DoubleArray>)Parameters["Weights"]; }
     }
     public IConstrainedValueParameter<IInteractionInitializer> InteractionInitializerParameter {
@@ -80 +80 @@
     public IntValue InteractionSeed {
       get { return InteractionSeedParameter.Value; }
+    }
+    public IntValue NrOfFitnessComponents {
+      get { return NrOfFitnessComponentsParameter.Value; }
+    }
+    public IntValue NrOfInteractions {
+      get { return NrOfInteractionsParameter.Value; }
+    }
+    public IWeightsInitializer WeightsInitializer {
+      get { return WeightsInitializerParameter.Value; }
     }
     #endregion
@@ -168 +177 @@
     }
 
-    void WeightsInitializerParameter_ValueChanged(object sender, EventArgs e) {
+    private void WeightsInitializerParameter_ValueChanged(object sender, EventArgs e) {
       InitializeWeights();
     }
 
-    void InteractionInitializerParameter_ValueChanged(object sender, EventArgs e) {
+    private void InteractionInitializerParameter_ValueChanged(object sender, EventArgs e) {
       InitializeInteractions();
     }
@@ -190 +199 @@
         GeneInteractionsParameter.Value = InteractionInitializer.InitializeInterations(
           Length,
-          NrOfFitnessComponentsParameter.Value.Value,
-          NrOfInteractionsParameter.Value.Value, Random);
+          NrOfFitnessComponents.Value,
+          NrOfInteractions.Value, Random);
     }
 
@@ -197 +206 @@
       if (WeightsInitializerParameter.Value != null)
         WeightsParameter.Value = new DoubleArray(
-          WeightsInitializerParameter.Value.GetWeights(NrOfFitnessComponentsParameter.Value.Value)
+          WeightsInitializer.GetWeights(NrOfFitnessComponents.Value)
           .ToArray());
     }

branches/FitnessLandscapeAnalysis/HeuristicLab.Problems.NK/NKMoveEvaluator.cs

@@ -25 +25 @@
 using HeuristicLab.Encodings.BinaryVectorEncoding;
 using HeuristicLab.Operators;
-using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -31 +30 @@
 namespace HeuristicLab.Problems.NK {
 
-  [Item("NKMoveEvaluator", "A base class for operators which evaluate moves on the NK Lanscape.")]
+  [Item("NKMoveEvaluator", "A base class for operators which evaluate moves on the NK Landscape.")]
   [StorableClass]
-  public abstract class NKMoveEvaluator : SingleSuccessorOperator, INKMoveEvaluator, IMoveOperator, IBinaryVectorMoveOperator {
+  public abstract class NKMoveEvaluator : SingleSuccessorOperator, INKMoveEvaluator, IBinaryVectorMoveOperator {
 
     public ILookupParameter<DoubleValue> QualityParameter {
@@ -44 +43 @@
       get { return (ILookupParameter<BinaryVector>)Parameters["BinaryVector"]; }
     }
-    public LookupParameter<BoolMatrix> GeneInteractionsParameter {
-      get { return (LookupParameter<BoolMatrix>)Parameters["GeneInteractions"]; }
+    public ILookupParameter<BoolMatrix> GeneInteractionsParameter {
+      get { return (ILookupParameter<BoolMatrix>)Parameters["GeneInteractions"]; }
     }
-    public LookupParameter<IntValue> InteractionSeedParameter {
-      get { return (LookupParameter<IntValue>)Parameters["InteractionSeed"]; }
+    public ILookupParameter<IntValue> InteractionSeedParameter {
+      get { return (ILookupParameter<IntValue>)Parameters["InteractionSeed"]; }
     }
-    public LookupParameter<DoubleArray> WeightsParameter {
-      get { return (LookupParameter<DoubleArray>)Parameters["Weights"]; }
+    public ILookupParameter<DoubleArray> WeightsParameter {
+      get { return (ILookupParameter<DoubleArray>)Parameters["Weights"]; }
     }
 

branches/FitnessLandscapeAnalysis/HeuristicLab.Problems.NK/Properties/AssemblyInfo.cs.frame

@@ -27 +27 @@
 // associated with an assembly.
 [assembly: AssemblyTitle("HeuristicLab.Problems.NK")]
-[assembly: AssemblyDescription("NK Fitness Lanscape Analysis Test Problem")]
+[assembly: AssemblyDescription("NK Fitness Landscape Analysis Test Problem")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]

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

@@ -27 +27 @@
 namespace HeuristicLab.Problems.NK.WeightInitializers {
 
-  [Item("EqualWeightsInitializer", "Initializes all weights to 1.0")]
+  [Item("EqualWeightsInitializer", "Initializes all weights to 1.0.")]
+  [StorableClass]
   public class EqualWeightsInitializer : NamedItem, IWeightsInitializer {
 

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

@@ -30 +30 @@
 namespace HeuristicLab.Problems.NK.WeightInitializers {
 
-  [Item("ExponentialDistributionWeightsInitializer", "Assigned exponentially decreasing weights using the rate parameter lambad.")]
+  [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 ValueParameter<DoubleValue> LambdaParameter {
-      get { return (ValueParameter<DoubleValue>)Parameters["Lambda"]; }
+    public IValueParameter<DoubleValue> LambdaParameter {
+      get { return (IValueParameter<DoubleValue>)Parameters["Lambda"]; }
     }
 
@@ -45 +46 @@
     }
     public ExponentialDistributionWeightsInitializer() {
-      Parameters.Add(new ValueParameter<DoubleValue>("Lambda", "The rate paramter of the exponential distribution.", new DoubleValue(1.0)));
+      Parameters.Add(new ValueParameter<DoubleValue>("Lambda", "The rate parameter of the exponential distribution.", new DoubleValue(1.0)));
     }
     public override IDeepCloneable Clone(Cloner cloner) {
@@ -52 +53 @@
 
     public static double f(double x, double lambda) {
-      if (x < 0)
-        return 0;
+      if (x < 0.0)
+        return 0.0;
       return lambda * Math.Exp(-lambda * x);
     }

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

@@ -28 +28 @@
 namespace HeuristicLab.Problems.NK.WeightInitializers {
 
-  [Item("ExponentialWeightsInitializer", "Assigned exponentially increasing weights.")]
+  [Item("ExponentialWeightsInitializer", "Assigns exponentially increasing weights.")]
+  [StorableClass]
   public class ExponentialWeightsInitializer : NamedItem, IWeightsInitializer {
 

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

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

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

@@ -27 +27 @@
 namespace HeuristicLab.Problems.NK.WeightInitializers {
 
-  [Item("LinearWeightsInitializer", "Assigned linear increasing weights.")]
+  [Item("LinearWeightsInitializer", "Assigns linear increasing weights.")]
+  [StorableClass]
   public class LinearWeightsInitializer : NamedItem, IWeightsInitializer {
 

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

@@ -28 +28 @@
 namespace HeuristicLab.Problems.NK.WeightInitializers {
 
-  [Item("ReverseExponentialWeightsInitializer", "Assigned exponentially decreasing weights.")]
+  [Item("ReverseExponentialWeightsInitializer", "Assigns exponentially decreasing weights.")]
+  [StorableClass]
   public class ReverseExponentialWeightsInitializer : NamedItem, IWeightsInitializer {
 

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

@@ -27 +27 @@
 namespace HeuristicLab.Problems.NK.WeightInitializers {
 
-  [Item("ReverseLienarWeightsInitializer", "Assigned exponentially decreasing weights.")]
+  [Item("ReverseLinearWeightsInitializer", "Assigns exponentially decreasing weights.")]
+  [StorableClass]
   public class ReverseLinearWeightsInitializer : NamedItem, IWeightsInitializer {