Changeset 12592 for branches

Timestamp:

07/06/15 10:07:15 (9 years ago)

Author:

ascheibe

Message:

#2306

• hide weight and interaction initializer parameters
• hide encoding parameter
• removed setting of BestKnownQuality
• added wiring code for interaction and weight initializers that have parameters
• made all interaction/weight initializers ParameterizedNamedItem

Location:

branches/FitnessLandscapeAnalysis/HeuristicLab.Problems.NK

Files:

• InteractionInitializers/IInteractionInitializer.cs (modified) (1 diff)
• InteractionInitializers/IncreasingBlockSizeInteractionsInitializer.cs (modified) (1 diff)
• InteractionInitializers/RandomInteractionsInitializer.cs (modified) (1 diff)
• NKLandscape.cs (modified) (6 diffs)
• WeightInitializers/EqualWeightsInitializer.cs (modified) (1 diff)
• 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/InteractionInitializers/IInteractionInitializer.cs

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

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

@@ -31 +31 @@
   [Item("IncreasingBlockSizeInteractionsInitializer", "Randomly assignes interactions across all bits but makes sure that different numbers of ineractions are applied to different bits.")]
   [StorableClass]
-  public sealed class IncreasingBlockSizeInteractionsInitializer : Item, IInteractionInitializer {
+  public sealed class IncreasingBlockSizeInteractionsInitializer : ParameterizedNamedItem, IInteractionInitializer {
     [StorableConstructor]
     private IncreasingBlockSizeInteractionsInitializer(bool serializing) : base(serializing) { }

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

@@ -29 +29 @@
   [Item("RandomInteractionsInitializer", "Randomly assignes interactions across all bits")]
   [StorableClass]
-  public sealed class RandomInteractionsInitializer : Item, IInteractionInitializer {
+  public sealed class RandomInteractionsInitializer : ParameterizedNamedItem, IInteractionInitializer {
     [StorableConstructor]
     private RandomInteractionsInitializer(bool serializing) : base(serializing) { }

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

@@ -34 +34 @@
 
 namespace HeuristicLab.Problems.NK {
-
   [Item("NK Landscape", "Represents an NK landscape optimization problem.")]
   [Creatable("Problems")]
@@ -156 +155 @@
       Parameters.Add(new OptionalConstrainedValueParameter<IWeightsInitializer>("WeightsInitializer", "Operator to initialize weights distribution"));
 
+      //allow just the standard NK[P,Q] formulations at the moment
+      WeightsParameter.Hidden = true;
+      InteractionInitializerParameter.Hidden = true;
+      WeightsInitializerParameter.Hidden = true;
+      EncodingParameter.Hidden = true;
+
       InitializeInteractionInitializerParameter();
       InitializeWeightsInitializerParameter();
 
       InitializeOperators();
+      InitializeInteractions();
       RegisterEventHandlers();
-      InitializeInteractions();
     }
 
@@ -180 +185 @@
     }
 
-    #region Events
-    protected override void LengthParameter_ValueChanged(object sender, EventArgs e) {
-      BestKnownQualityParameter.Value = new DoubleValue(Length);
-      NrOfFitnessComponentsParameter.Value = new IntValue(Length);
-    }
-    #endregion
-
-    #region Helpers
     [StorableHook(HookType.AfterDeserialization)]
     private void AfterDeserialization() {
@@ -194 +191 @@
 
     private void RegisterEventHandlers() {
-      NrOfInteractionsParameter.ValueChanged += InteractionParameterChanged;
-      NrOfInteractionsParameter.Value.ValueChanged += InteractionParameterChanged;
-      NrOfFitnessComponentsParameter.ValueChanged += InteractionParameterChanged;
-      NrOfFitnessComponentsParameter.Value.ValueChanged += InteractionParameterChanged;
-      InteractionInitializerParameter.ValueChanged += InteractionInitializerParameter_ValueChanged;
+      NrOfInteractionsParameter.ValueChanged += InteractionParameter_ValueChanged;
+      NrOfInteractionsParameter.Value.ValueChanged += InteractionParameter_ValueChanged;
+      NrOfFitnessComponentsParameter.ValueChanged += InteractionParameter_ValueChanged;
+      NrOfFitnessComponentsParameter.Value.ValueChanged += InteractionParameter_ValueChanged;
+      InteractionInitializerParameter.ValueChanged += InteractionParameter_ValueChanged;
       WeightsInitializerParameter.ValueChanged += WeightsInitializerParameter_ValueChanged;
       SeedParameter.ValueChanged += SeedParameter_ValueChanged;
       SeedParameter.Value.ValueChanged += SeedParameter_ValueChanged;
+
+      RegisterInteractionInitializerParameterEvents();
+      RegisterWeightsParameterEvents();
+    }
+
+    private void RegisterWeightsParameterEvents() {
+      foreach (var vv in WeightsInitializerParameter.ValidValues) {
+        foreach (var p in vv.Parameters) {
+          if (p.ActualValue != null && p.ActualValue is IStringConvertibleValue) {
+            var v = (IStringConvertibleValue)p.ActualValue;
+            v.ValueChanged += WeightsInitializerParameter_ValueChanged;
+          }
+        }
+      }
+    }
+
+    private void RegisterInteractionInitializerParameterEvents() {
+      foreach (var vv in InteractionInitializerParameter.ValidValues) {
+        foreach (var p in vv.Parameters) {
+          if (p.ActualValue != null && p.ActualValue is IStringConvertibleValue) {
+            var v = (IStringConvertibleValue)p.ActualValue;
+            v.ValueChanged += InteractionParameter_ValueChanged;
+          } else if (p.ActualValue != null && p is IConstrainedValueParameter<IBinaryVectorComparer>) {
+            ((IConstrainedValueParameter<IBinaryVectorComparer>)p).ValueChanged +=
+              InteractionParameter_ValueChanged;
+          }
+        }
+      }
+    }
+
+    protected override void LengthParameter_ValueChanged(object sender, EventArgs e) {
+      NrOfFitnessComponentsParameter.Value = new IntValue(Length);
     }
 
@@ -214 +243 @@
     }
 
-    private void InteractionInitializerParameter_ValueChanged(object sender, EventArgs e) {
-      InitializeInteractions();
-    }
-
-    private void InteractionParameterChanged(object sender, EventArgs e) {
+    private void InteractionParameter_ValueChanged(object sender, EventArgs e) {
       InitializeInteractions();
     }
@@ -242 +267 @@
           .ToArray());
     }
-    #endregion
 
     #region Evaluation function

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

@@ -28 +28 @@
   [Item("EqualWeightsInitializer", "Initializes all weights to 1.0.")]
   [StorableClass]
-  public sealed class EqualWeightsInitializer : Item, IWeightsInitializer {
+  public sealed class EqualWeightsInitializer : ParameterizedNamedItem, IWeightsInitializer {
     [StorableConstructor]
     private EqualWeightsInitializer(bool deserializing) : base(deserializing) { }

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

@@ -29 +29 @@
   [Item("ExponentialWeightsInitializer", "Assigns exponentially increasing weights.")]
   [StorableClass]
-  public sealed class ExponentialWeightsInitializer : Item, IWeightsInitializer {
+  public sealed class ExponentialWeightsInitializer : ParameterizedNamedItem, IWeightsInitializer {
     [StorableConstructor]
     private ExponentialWeightsInitializer(bool deserializing) : base(deserializing) { }

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

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

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

@@ -28 +28 @@
   [Item("LinearWeightsInitializer", "Assigns linear increasing weights.")]
   [StorableClass]
-  public sealed class LinearWeightsInitializer : Item, IWeightsInitializer {
+  public sealed class LinearWeightsInitializer : ParameterizedNamedItem, IWeightsInitializer {
     [StorableConstructor]
     private LinearWeightsInitializer(bool deserializing) : base(deserializing) { }

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

@@ -29 +29 @@
   [Item("ReverseExponentialWeightsInitializer", "Assigns exponentially decreasing weights.")]
   [StorableClass]
-  public sealed class ReverseExponentialWeightsInitializer : Item, IWeightsInitializer {
+  public sealed class ReverseExponentialWeightsInitializer : ParameterizedNamedItem, IWeightsInitializer {
     [StorableConstructor]
     private ReverseExponentialWeightsInitializer(bool deserializing) : base(deserializing) { }

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

@@ -28 +28 @@
   [Item("ReverseLinearWeightsInitializer", "Assigns exponentially decreasing weights.")]
   [StorableClass]
-  public sealed class ReverseLinearWeightsInitializer : Item, IWeightsInitializer {
+  public sealed class ReverseLinearWeightsInitializer : ParameterizedNamedItem, IWeightsInitializer {
     [StorableConstructor]
     private ReverseLinearWeightsInitializer(bool deserializing) : base(deserializing) { }