Changeset 11587 for branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/Encodings/Encoding.cs

Timestamp:

11/26/14 13:24:20 (9 years ago)

Author:

mkommend

Message:

#2174: Implemented multi-encoding operators and adapated wiring of operators in the programmable problems.

File:

• branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/Encodings/Encoding.cs (modified) (4 diffs)

branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/Encodings/Encoding.cs

@@ -37 +37 @@
     }
 
-    public virtual IEnumerable<IValueParameter> Parameters {
-      get { return Enumerable.Empty<IValueParameter>(); }
-    }
+    public abstract IEnumerable<IValueParameter> Parameters { get; }
 
-    protected List<IOperator> encodingOperators = new List<IOperator>();
+    protected HashSet<IOperator> encodingOperators = new HashSet<IOperator>(new TypeEqualityComparer<IOperator>());
     [Storable]
     public IEnumerable<IOperator> Operators {
       get { return encodingOperators; }
-      protected set { encodingOperators = new List<IOperator>(value); }
+      private set { encodingOperators = new HashSet<IOperator>(value, new TypeEqualityComparer<IOperator>()); }
     }
-
 
     ISolutionCreator IEncoding.SolutionCreator {
       get { return SolutionCreator; }
       set {
-        if (!(value is T)) throw new ArgumentException("???");
+        if (!(value is T)) throw new ArgumentException(string.Format("Cannot assign the solution creator {0} to the encoding {1}.", value.GetType().GetPrettyName(), GetType().GetPrettyName()));
         SolutionCreator = (T)value;
       }
@@ -64 +61 @@
         if (value == null) throw new ArgumentNullException("SolutionCreator must not be null.");
         if (solutionCreator == value) return;
+        encodingOperators.Remove(solutionCreator);
+        encodingOperators.Add(value);
         solutionCreator = value;
         OnSolutionCreatorChanged();
@@ -74 +73 @@
     protected Encoding(Encoding<T> original, Cloner cloner)
       : base(original, cloner) {
-      encodingOperators = original.Operators.Select(cloner.Clone).ToList();
+      encodingOperators = new HashSet<IOperator>(original.Operators.Select(cloner.Clone));
       solutionCreator = cloner.Clone(original.solutionCreator);
     }
@@ -80 +79 @@
 
 
+    public abstract void ConfigureOperators(IEnumerable<IOperator> operators);
+    public void ConfigureOperator(IOperator @operator) { ConfigureOperators(new[] { @operator }); }
 
-    public void ConfigureOperator(IOperator @operator) {
-      ConfigureOperators(new[] { @operator });
-    }
-    public virtual void ConfigureOperators(IEnumerable<IOperator> operators) {
-
-    }
-
+    public event EventHandler SolutionCreatorChanged;
     protected virtual void OnSolutionCreatorChanged() {
       ConfigureOperator(SolutionCreator);
+      var handler = SolutionCreatorChanged;
+      if (handler != null) handler(this, EventArgs.Empty);
     }