Changeset 11587 for branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/Encodings/MultiEncoding.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/MultiEncoding.cs (modified) (2 diffs)

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

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Encodings.PermutationEncoding;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.PluginInfrastructure;
+using HeuristicLab.Problems.Programmable.Interfaces;
 
 namespace HeuristicLab.Problems.Programmable {
@@ -31 +33 @@
   [StorableClass]
   public class MultiEncoding : Encoding<MultiEncodingCreator> {
+
+    private readonly List<IEncoding> encodings;
+
     [Storable]
-    public KeyedItemCollection<string, IEncoding> Encodings { get; protected set; }
+    public IEnumerable<IEncoding> Encodings {
+      get { return encodings; }
+      private set { encodings.AddRange(value); }
+    }
+
+    public override IEnumerable<IValueParameter> Parameters {
+      get { return Encodings.SelectMany(e => e.Parameters); }
+    }
 
     [StorableConstructor]
-    protected MultiEncoding(bool deserializing) : base(deserializing) { }
+    protected MultiEncoding(bool deserializing)
+      : base(deserializing) {
+      encodings = new List<IEncoding>();
+    }
+
+    public override IDeepCloneable Clone(Cloner cloner) { return new MultiEncoding(this, cloner); }
     protected MultiEncoding(MultiEncoding original, Cloner cloner)
       : base(original, cloner) {
-      Encodings = cloner.Clone(original.Encodings);
+      encodings = new List<IEncoding>(original.Encodings.Select(cloner.Clone));
     }
     public MultiEncoding()
       : base("MultiEncoding") {
-      Encodings = new NamedItemCollection<IEncoding>();
+      encodings = new List<IEncoding>();
+      SolutionCreator = new MultiEncodingCreator();
+
+      foreach (var @operator in ApplicationManager.Manager.GetInstances<IMultiEncodingOperator>())
+        encodingOperators.Add(@operator);
     }
 
-    public override IDeepCloneable Clone(Cloner cloner) {
-      return new MultiEncoding(this, cloner);
-    }
+    public MultiEncoding Add(IEncoding encoding) {
+      if (encoding is MultiEncoding) throw new InvalidOperationException("Nesting of MultiEncodings is not supported.");
+      if (Encodings.Any(e => e.Name == encoding.Name)) throw new ArgumentException("Encoding name must be unique", "encoding.Name");
+      encodings.Add(encoding);
 
-    public MultiEncoding AddBinaryVector(string variableName, int length) {
-      if (Encodings.ContainsKey(variableName)) throw new ArgumentException("variableName must be unique", "variableName");
-      Encodings.Add(new BinaryEncoding(variableName, length));
+      foreach (var @operator in Operators.OfType<IMultiEncodingOperator>()) {
+        @operator.AddEncoding(encoding);
+      }
       return this;
     }
 
-    public MultiEncoding AddIntegerVector(string variableName, int length, int min, int max, int? step = null) {
-      if (Encodings.ContainsKey(variableName)) throw new ArgumentException("variableName must be unique", "variableName");
-      Encodings.Add(new IntegerEncoding(variableName, length, min, max, step));
-      return this;
+    public bool Remove(IEncoding encoding) {
+      var success = encodings.Remove(encoding);
+      foreach (var @operator in Operators.OfType<IMultiEncodingOperator>()) {
+        @operator.RemoveEncoding(encoding);
+      }
+      return success;
     }
 
-    public MultiEncoding AddIntegerVector(string variableName, int length, IList<int> min, IList<int> max, IList<int> step = null) {
-      if (Encodings.ContainsKey(variableName)) throw new ArgumentException("variableName must be unique", "variableName");
-      Encodings.Add(new IntegerEncoding(variableName, length, min, max, step));
-      return this;
-    }
+    public override void ConfigureOperators(IEnumerable<IOperator> operators) {
 
-    public MultiEncoding AddRealVector(string variableName, int length, double min, double max) {
-      if (Encodings.ContainsKey(variableName)) throw new ArgumentException("variableName must be unique", "variableName");
-      Encodings.Add(new RealEncoding(variableName, length, min, max));
-      return this;
-    }
-
-    public MultiEncoding AddRealVector(string variableName, int length, IList<double> min, IList<double> max) {
-      if (Encodings.ContainsKey(variableName)) throw new ArgumentException("variableName must be unique", "variableName");
-      Encodings.Add(new RealEncoding(variableName, length, min, max));
-      return this;
-    }
-
-    public MultiEncoding AddPermutation(string variableName, int length, PermutationTypes type) {
-      if (Encodings.ContainsKey(variableName)) throw new ArgumentException("variableName must be unique", "variableName");
-      Encodings.Add(new PermutationEncoding(variableName, length, type));
-      return this;
     }
   }