Changeset 17544 for branches/2521_ProblemRefactoring/HeuristicLab.Encodings.PermutationEncoding/3.3/PermutationProblem.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.Encodings.PermutationEncoding/3.3/PermutationProblem.cs (modified) (4 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Encodings.PermutationEncoding/3.3/PermutationProblem.cs

@@ -28 +28 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Data;
 using HeuristicLab.Optimization;
 using HeuristicLab.Optimization.Operators;
+using HeuristicLab.Parameters;
 
 namespace HeuristicLab.Encodings.PermutationEncoding {
   [StorableType("aceff7a2-0666-4055-b698-6ea3628713b6")]
   public abstract class PermutationProblem : SingleObjectiveProblem<PermutationEncoding, Permutation> {
-    public int Length {
-      get { return Encoding.Length; }
-      set { Encoding.Length = value; }
-    }
+    [Storable] protected ReferenceParameter<IntValue> DimensionRefParameter { get; private set; }
+    public IValueParameter<IntValue> DimensionParameter => DimensionRefParameter;
 
-    public PermutationTypes Type {
-      get { return Encoding.Type; }
-      set { Encoding.Type = value; }
+    public int Dimension {
+      get { return DimensionRefParameter.Value.Value; }
+      set { DimensionRefParameter.Value.Value = value; }
     }
 
@@ -53 +53 @@
     protected PermutationProblem(PermutationProblem original, Cloner cloner)
       : base(original, cloner) {
+      DimensionRefParameter = cloner.Clone(original.DimensionRefParameter);
       RegisterEventHandlers();
     }
@@ -59 +60 @@
     protected PermutationProblem(PermutationEncoding encoding) : base(encoding) {
       EncodingParameter.ReadOnly = true;
+      Parameters.Add(DimensionRefParameter = new ReferenceParameter<IntValue>("Dimension", "The dimension of the permutation problem.", Encoding.LengthParameter));
 
       Operators.Add(new HammingSimilarityCalculator());
@@ -87 +89 @@
 
     private void RegisterEventHandlers() {
-      Encoding.LengthParameter.Value.ValueChanged += LengthParameter_ValueChanged;
-      Encoding.PermutationTypeParameter.Value.ValueChanged += TypeParameter_ValueChanged;
+      DimensionRefParameter.Value.ValueChanged += DimensionParameter_Value_ValueChanged;
     }
 
-    protected virtual void LengthParameter_ValueChanged(object sender, EventArgs e) { }
-    protected virtual void TypeParameter_ValueChanged(object sender, EventArgs e) { }
+    private void DimensionParameter_Value_ValueChanged(object sender, EventArgs e) {
+      DimensionOnChanged();
+    }
+
+    protected virtual void DimensionOnChanged() { }
   }
 }