Changeset 11990 for trunk/sources

Timestamp:

02/12/15 16:32:37 (10 years ago)

Author:

mkommend

Message:

#2282: Added best known quality parameter to single-objective basic problem and new one-max problem.

Location:

trunk/sources

Files:

• HeuristicLab.Optimization/3.3/BasicProblems/SingleObjectiveBasicProblem.cs (modified) (1 diff)
• HeuristicLab.Problems.Binary/3.3/BinaryProblem.cs (modified) (4 diffs)
• HeuristicLab.Problems.Binary/3.3/HeuristicLab.Problems.Binary-3.3.csproj (modified) (1 diff)
• HeuristicLab.Problems.Binary/3.3/OneMaxProblem.cs (added)

trunk/sources/HeuristicLab.Optimization/3.3/BasicProblems/SingleObjectiveBasicProblem.cs

@@ -33 +33 @@
     ISingleObjectiveProblemDefinition, ISingleObjectiveHeuristicOptimizationProblem
   where TEncoding : class, IEncoding {
+
+    protected IValueParameter<DoubleValue> BestKnownQualityParameter {
+      get { return (IValueParameter<DoubleValue>)Parameters["BestKnownQuality"]; }
+    }
+
+    public double BestKnownQuality {
+      get {
+        if (BestKnownQualityParameter.Value == null) return double.NaN;
+        return BestKnownQualityParameter.Value.Value;
+      }
+      set {
+        if (BestKnownQualityParameter.Value == null) BestKnownQualityParameter.Value = new DoubleValue(value);
+        else BestKnownQualityParameter.Value.Value = value;
+      }
+    }
+
     [StorableConstructor]
     protected SingleObjectiveBasicProblem(bool deserializing) : base(deserializing) { }

trunk/sources/HeuristicLab.Problems.Binary/3.3/BinaryProblem.cs

@@ -22 +22 @@
 #endregion
 
+using System;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -33 +34 @@
   [StorableClass]
   public abstract class BinaryProblem : SingleObjectiveBasicProblem<BinaryVectorEncoding> {
-
     public virtual int Length {
       get { return Encoding.Length; }
@@ -39 +39 @@
     }
 
+    private IFixedValueParameter<IntValue> LengthParameter {
+      get { return (IFixedValueParameter<IntValue>)Parameters["Length"]; }
+    }
+
     [StorableConstructor]
     protected BinaryProblem(bool deserializing) : base(deserializing) { }
-    protected BinaryProblem(BinaryProblem original, Cloner cloner) : base(original, cloner) { }
-    protected BinaryProblem() : base() { }
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() {
+      RegisterEventHandlers();
+    }
+
+    protected BinaryProblem(BinaryProblem original, Cloner cloner)
+      : base(original, cloner) {
+      RegisterEventHandlers();
+    }
+
+    protected BinaryProblem()
+      : base() {
+      var lengthParameter = new FixedValueParameter<IntValue>("Length", "The length of the BinaryVector.", new IntValue(10));
+      Parameters.Add(lengthParameter);
+      Encoding.LengthParameter = lengthParameter;
+      RegisterEventHandlers();
+    }
 
     public virtual bool IsBetter(double quality, double bestQuality) {
@@ -53 +72 @@
 
     public abstract double Evaluate(BinaryVector vector, IRandom random);
+
+    protected override void OnEncodingChanged() {
+      base.OnEncodingChanged();
+      Encoding.LengthParameter = LengthParameter;
+    }
+
+
+    private void RegisterEventHandlers() {
+      LengthParameter.Value.ValueChanged += LengthParameter_ValueChanged;
+    }
+
+    protected virtual void LengthParameter_ValueChanged(object sender, EventArgs e) { }
   }
 }

trunk/sources/HeuristicLab.Problems.Binary/3.3/HeuristicLab.Problems.Binary-3.3.csproj

@@ -86 +86 @@
     <Compile Include="DeceptiveTrapProblem.cs" />
     <Compile Include="HIFFProblem.cs" />
+    <Compile Include="OneMaxProblem.cs" />
     <Compile Include="Plugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />