Changeset 17544 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.QuadraticAssignment/3.3/QuadraticAssignmentProblem.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.QuadraticAssignment/3.3/QuadraticAssignmentProblem.cs (modified) (5 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Problems.QuadraticAssignment/3.3/QuadraticAssignmentProblem.cs

@@ -102 +102 @@
       LowerBoundParameter = cloner.Clone(original.LowerBoundParameter);
       AverageQualityParameter = cloner.Clone(original.AverageQualityParameter);
-      RegisterEventHandlers();
     }
     public QuadraticAssignmentProblem()
@@ -133 +132 @@
 
       InitializeOperators();
-      RegisterEventHandlers();
     }
 
@@ -155 +153 @@
     }
 
-    [StorableHook(HookType.AfterDeserialization)]
-    private void AfterDeserialization() {
-      // BackwardsCompatibility3.3
-      #region Backwards compatible code, remove with 3.4
-      if (BestKnownSolutionsParameter == null)
-        BestKnownSolutionsParameter = (IValueParameter<ItemSet<Permutation>>)Parameters["BestKnownSolutions"];
-      if (BestKnownSolutionParameter == null)
-        BestKnownSolutionParameter = (IValueParameter<Permutation>)Parameters["BestKnownSolution"];
-      if (WeightsParameter == null)
-        WeightsParameter = (IValueParameter<DoubleMatrix>)Parameters["Weights"];
-      if (DistancesParameter == null)
-        DistancesParameter = (IValueParameter<DoubleMatrix>)Parameters["Distances"];
-      if (LowerBoundParameter == null)
-        LowerBoundParameter = (IValueParameter<DoubleValue>)Parameters["LowerBound"];
-      if (AverageQualityParameter == null)
-        AverageQualityParameter = (IValueParameter<DoubleValue>)Parameters["AverageQuality"];
-      #endregion
-      RegisterEventHandlers();
-    }
-
     #region Events
     protected override void OnEncodingChanged() {
       base.OnEncodingChanged();
-      Encoding.Length = Weights.Rows;
+      Dimension = Weights.Rows;
       Parameterize();
     }
@@ -191 +169 @@
     #endregion
 
-    private void RegisterEventHandlers() {
-      Encoding.LengthParameter.Value.ValueChanged += EncodingLengthOnChanged;
-    }
-
-    private void EncodingLengthOnChanged(object sender, EventArgs e) {
-      if (Encoding.Length != Weights.Rows) Encoding.Length = Weights.Rows;
+    protected override void DimensionOnChanged() {
+      base.DimensionOnChanged();
+      if (Dimension != Weights.Rows) Dimension = Weights.Rows;
     }
 
@@ -354 +329 @@
       Weights = weights;
       Distances = distances;
-      Encoding.Length = weights.Rows;
+      Dimension = weights.Rows;
 
       BestKnownQualityParameter.Value = null;