Changeset 17587 for branches/2521_ProblemRefactoring/HeuristicLab.Encodings.IntegerVectorEncoding/3.3/IntegerVectorMultiObjectiveProblem.cs

Timestamp:

06/04/20 18:16:58 (4 years ago)

Author:

abeham

Message:

#2521: refactoring in progress

File:

• branches/2521_ProblemRefactoring/HeuristicLab.Encodings.IntegerVectorEncoding/3.3/IntegerVectorMultiObjectiveProblem.cs (modified) (5 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Encodings.IntegerVectorEncoding/3.3/IntegerVectorMultiObjectiveProblem.cs

@@ -22 +22 @@
 #endregion
 
-using System;
 using System.Linq;
 using HEAL.Attic;
@@ -38 +37 @@
     public IResultDefinition<ParetoFrontScatterPlot<IntegerVector>> BestResult { get { return BestResultParameter; } }
     [Storable] protected ReferenceParameter<IntValue> DimensionRefParameter { get; private set; }
-    public IValueParameter<IntValue> DimensionParameter => DimensionRefParameter;
+    [Storable] protected ReferenceParameter<IntMatrix> BoundsRefParameter { get; private set; }
 
     public int Dimension {
       get { return DimensionRefParameter.Value.Value; }
       set { DimensionRefParameter.Value.Value = value; }
+    }
+
+    public IntMatrix Bounds {
+      get { return BoundsRefParameter.Value; }
+      set { BoundsRefParameter.Value = value; }
     }
 
@@ -56 +60 @@
       BestResultParameter = cloner.Clone(original.BestResultParameter);
       DimensionRefParameter = cloner.Clone(original.DimensionRefParameter);
+      BoundsRefParameter = cloner.Clone(original.BoundsRefParameter);
       RegisterEventHandlers();
     }
@@ -64 +69 @@
       Parameters.Add(BestResultParameter = new ResultParameter<ParetoFrontScatterPlot<IntegerVector>>("Best Pareto Front", "The best Pareto front found."));
       Parameters.Add(DimensionRefParameter = new ReferenceParameter<IntValue>("Dimension", "The dimension of the integer vector problem.", Encoding.LengthParameter));
+      Parameters.Add(BoundsRefParameter = new ReferenceParameter<IntMatrix>("Bounds", "The bounds of the integer vector problem.", Encoding.BoundsParameter));
 
       Operators.Add(new HammingSimilarityCalculator());
@@ -94 +100 @@
 
     private void RegisterEventHandlers() {
-      DimensionRefParameter.Value.ValueChanged += DimensionParameter_Value_ValueChanged;
-    }
-
-    private void DimensionParameter_Value_ValueChanged(object sender, EventArgs e) {
-      DimensionOnChanged();
+      IntValueParameterChangeHandler.Create(DimensionRefParameter, DimensionOnChanged);
+      IntMatrixParameterChangeHandler.Create(BoundsRefParameter, BoundsOnChanged);
     }
 
     protected virtual void DimensionOnChanged() { }
+
+    protected virtual void BoundsOnChanged() { }
   }
 }