Changeset 17587 for branches/2521_ProblemRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding

Timestamp:

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

Author:

abeham

Message:

#2521: refactoring in progress

File:

• branches/2521_ProblemRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/BinaryVectorEncoding.cs (modified) (4 diffs)

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

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
-using System.ComponentModel;
 using System.Linq;
 using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Data;
 using HeuristicLab.Optimization;
-using HeuristicLab.Parameters;
 using HeuristicLab.PluginInfrastructure;
 
@@ -35 +32 @@
   [Item("BinaryVectorEncoding", "Describes a binary vector encoding.")]
   [StorableType("889C5E1A-3FBF-4AB3-AB2E-199A781503B5")]
-  public sealed class BinaryVectorEncoding : Encoding<BinaryVector>, INotifyPropertyChanged {
-    #region Encoding Parameters
-    [Storable] public IValueParameter<IntValue> LengthParameter { get; private set; }
-    #endregion
-
-    public int Length {
-      get { return LengthParameter.Value.Value; }
-      set {
-        if (Length == value) return;
-        LengthParameter.Value = new IntValue(value, @readonly: LengthParameter.Value.ReadOnly);
-      }
-    }
+  public sealed class BinaryVectorEncoding : VectorEncoding<BinaryVector> {
 
     [StorableConstructor]
@@ -53 +39 @@
     private void AfterDeserialization() {
       DiscoverOperators();
-      RegisterEventHandlers();
     }
     public override IDeepCloneable Clone(Cloner cloner) { return new BinaryVectorEncoding(this, cloner); }
-    private BinaryVectorEncoding(BinaryVectorEncoding original, Cloner cloner)
-      : base(original, cloner) {
-      LengthParameter = cloner.Clone(original.LengthParameter);
-      RegisterEventHandlers();
-    }
-
+    private BinaryVectorEncoding(BinaryVectorEncoding original, Cloner cloner) : base(original, cloner) { }
     public BinaryVectorEncoding() : this("BinaryVector", 10) { }
     public BinaryVectorEncoding(string name) : this(name, 10) { }
     public BinaryVectorEncoding(int length) : this("BinaryVector", length) { }
     public BinaryVectorEncoding(string name, int length)
-      : base(name) {
-      Parameters.Add(LengthParameter = new ValueParameter<IntValue>(Name + ".Length", new IntValue(length)) { ReadOnly = true });
-      
+      : base(name, length) {      
       SolutionCreator = new RandomBinaryVectorCreator();
+
       DiscoverOperators();
-
-      RegisterEventHandlers();
-    }
-
-    private void RegisterEventHandlers() {
-      IntValueParameterChangeHandler.Create(LengthParameter, () => OnPropertyChanged(nameof(Length)));
     }
 
@@ -153 +126 @@
     }
     #endregion
-
-    public event PropertyChangedEventHandler PropertyChanged;
-    private void OnPropertyChanged(string property) {
-      PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(property));
-    }
   }
 }