Changeset 17544 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.Binary/3.3/DeceptiveStepTrapProblem.cs

Timestamp:

05/18/20 18:55:08 (4 years ago)

Author:

abeham

Message:

#2521: worked on refactoring, worked a lot on binary encoding / problems

File:

• branches/2521_ProblemRefactoring/HeuristicLab.Problems.Binary/3.3/DeceptiveStepTrapProblem.cs (modified) (4 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Problems.Binary/3.3/DeceptiveStepTrapProblem.cs

@@ -22 +22 @@
 #endregion
 
+using System;
 using HEAL.Attic;
 using HeuristicLab.Common;
@@ -34 +35 @@
   [Creatable(CreatableAttribute.Categories.CombinatorialProblems, Priority = 230)]
   public class DeceptiveStepTrapProblem : DeceptiveTrapProblem {
-    [StorableConstructor]
-    protected DeceptiveStepTrapProblem(StorableConstructorFlag _) : base(_) { }
-    protected DeceptiveStepTrapProblem(DeceptiveStepTrapProblem original, Cloner cloner)
-      : base(original, cloner) {
-      RegisterParameterEvents();
-    }
-    public override IDeepCloneable Clone(Cloner cloner) {
-      return new DeceptiveStepTrapProblem(this, cloner);
-    }
-
-    private const string StepSizeParameterName = "Step Size";
-
-    public IFixedValueParameter<IntValue> StepSizeParameter {
-      get { return (IFixedValueParameter<IntValue>)Parameters[StepSizeParameterName]; }
-    }
+    [Storable] private int offset = -1;
+    [Storable] public IFixedValueParameter<IntValue> StepSizeParameter { get; private set; }
 
     public int StepSize {
@@ -56 +44 @@
 
     public DeceptiveStepTrapProblem() : base() {
-      Parameters.Add(new FixedValueParameter<IntValue>(StepSizeParameterName, "", new IntValue(2)));
+      Parameters.Add(StepSizeParameter = new FixedValueParameter<IntValue>("Step Size", "", new IntValue(2)));
+      offset = (TrapSize - StepSize) % StepSize;
+
       RegisterParameterEvents();
     }
+
+    protected override int TrapMaximum {
+      get { return (offset + TrapSize) / StepSize; }
+    }
+
+    protected override int Score(BinaryVector individual, int trapIndex, int trapSize) {
+      int partial = base.Score(individual, trapIndex, trapSize);
+      // introduce plateaus using integer division
+      return (offset + partial) / StepSize;
+    }
+
+    [StorableConstructor]
+    protected DeceptiveStepTrapProblem(StorableConstructorFlag _) : base(_) { }
 
     [StorableHook(HookType.AfterDeserialization)]
@@ -64 +67 @@
       RegisterParameterEvents();
     }
+    protected DeceptiveStepTrapProblem(DeceptiveStepTrapProblem original, Cloner cloner)
+      : base(original, cloner) {
+      offset = original.offset;
+      StepSizeParameter = cloner.Clone(original.StepSizeParameter);
+
+      RegisterParameterEvents();
+    }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new DeceptiveStepTrapProblem(this, cloner);
+    }
 
     private void RegisterParameterEvents() {
-      TrapSizeParameter.Value.ValueChanged += (o, e) => { offset = -1; };
-      StepSizeParameter.Value.ValueChanged += (o, e) => { offset = -1; };
+      StepSizeParameter.Value.ValueChanged += StepSizeOnChanged;
     }
 
-
-    private int offset = -1;
-    private int Offset {
-      get {
-        if (offset == -1) offset = (TrapSize - StepSize) % StepSize;
-        return offset;
-      }
+    protected override void TrapSizeOnChanged(object sender, EventArgs e) {
+      base.TrapSizeOnChanged(sender, e);
+      offset = (TrapSize - StepSize) % StepSize;
     }
 
-    protected override int TrapMaximum {
-      get { return (Offset + TrapSize) / StepSize; }
-    }
-
-    protected override int Score(BinaryVector individual, int trapIndex, int trapSize) {
-      int partial = base.Score(individual, trapIndex, trapSize);
-      // introduce plateaus using integer division
-      return (Offset + partial) / StepSize;
+    private void StepSizeOnChanged(object sender, EventArgs e) {
+      offset = (TrapSize - StepSize) % StepSize;
     }
   }