Changeset 17545

Timestamp:

05/19/20 09:59:57 (4 years ago)

Author:

abeham

Message:

#2521: Reverse behavior, parameters are not readonly by default, can be readonly if computed automatically

Location:

branches/2521_ProblemRefactoring

Files:

• HeuristicLab.Encodings.BinaryVectorEncoding/3.3/BinaryVectorEncoding.cs (modified) (1 diff)
• HeuristicLab.Encodings.BinaryVectorEncoding/3.3/BinaryVectorMultiObjectiveProblem.cs (modified) (3 diffs)
• HeuristicLab.Problems.Binary/3.3/DeceptiveTrapProblem.cs (modified) (1 diff)
• HeuristicLab.Problems.Binary/3.3/HIFFProblem.cs (modified) (2 diffs)
• HeuristicLab.Problems.Binary/3.3/OneMaxProblem.cs (modified) (2 diffs)
• HeuristicLab.Problems.Knapsack/3.3/KnapsackProblem.cs (modified) (1 diff)

branches/2521_ProblemRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/BinaryVectorEncoding.cs

@@ -67 +67 @@
     public BinaryVectorEncoding(string name, int length)
       : base(name) {
-      Parameters.Add(LengthParameter = new ValueParameter<IntValue>(Name + ".Length", new IntValue(length, @readonly: true)) { ReadOnly = true });
+      Parameters.Add(LengthParameter = new ValueParameter<IntValue>(Name + ".Length", new IntValue(length)) { ReadOnly = true });
       
       SolutionCreator = new RandomBinaryVectorCreator();

branches/2521_ProblemRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/BinaryVectorMultiObjectiveProblem.cs

@@ -20 +20 @@
 #endregion
 
-using System;
 using System.Linq;
 using HEAL.Attic;
@@ -36 +35 @@
     public IResultDefinition<ParetoFrontScatterPlot<BinaryVector>> BestResult { get { return BestResultParameter; } }
     [Storable] protected ReferenceParameter<IntValue> DimensionRefParameter { get; private set; }
-    public IValueParameter<IntValue> DimensionParameter => DimensionRefParameter;
 
     public int Dimension {
-      get { return DimensionRefParameter.Value.Value; }
-      set { DimensionRefParameter.Value.Value = value; }
+      get { return Encoding.Length; }
+      set { Encoding.Length = value; }
     }
 
@@ -92 +90 @@
 
     private void RegisterEventHandlers() {
-      DimensionRefParameter.Value.ValueChanged += DimensionParameter_Value_ValueChanged;
-    }
-
-    private void DimensionParameter_Value_ValueChanged(object sender, EventArgs e) {
-      DimensionOnChanged();
+      Encoding.PropertyChanged += (sender, args) => {
+        if (args.PropertyName == nameof(Encoding.Length))
+          DimensionOnChanged();
+      };
     }
 

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

@@ -58 +58 @@
       Parameters.Add(TrapSizeParameter = new FixedValueParameter<IntValue>("Trap Size", "", new IntValue(7)));
       Parameters.Add(NumberOfTrapsParameter = new FixedValueParameter<IntValue>("Number of Traps", "", new IntValue(7)));
-      Dimension = TrapSize * NumberOfTraps;
+      DimensionRefParameter.ForceValue(new IntValue(TrapSize * NumberOfTraps, @readonly: true));
 
       RegisterEventHandlers();

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

@@ -27 +27 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Data;
 using HeuristicLab.Encodings.BinaryVectorEncoding;
 using HeuristicLab.Optimization;
@@ -39 +38 @@
     public HIFFProblem() : base() {
       Maximization = true;
-      DimensionRefParameter.ForceValue(new IntValue(64, @readonly: false));
+      Dimension = 64;
     }
 

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

@@ -25 +25 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Data;
 using HeuristicLab.Encodings.BinaryVectorEncoding;
 using HeuristicLab.Optimization;
@@ -37 +36 @@
     public OneMaxProblem() : base() {
       Maximization = true;
-      DimensionRefParameter.ForceValue(new IntValue(10, @readonly: false));
+      Dimension = 10;
       BestKnownQuality = Dimension;
     }

branches/2521_ProblemRefactoring/HeuristicLab.Problems.Knapsack/3.3/KnapsackProblem.cs

@@ -91 +91 @@
       Parameters.Add(new OptionalValueParameter<BinaryVector>("BestKnownSolution", "The best known solution of this Knapsack instance."));
 
-      Dimension = Weights.Length;
+      DimensionRefParameter.ForceValue(new IntValue(Weights.Length, @readonly: true));
       InitializeRandomKnapsackInstance();