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

Timestamp:

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

Author:

mkommend

Message:

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

Location:

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

Files:

• BinaryEncoding.cs (modified) (3 diffs)
• Encoding.cs (modified) (4 diffs)
• IntegerEncoding.cs (modified) (6 diffs)
• MultiEncoding.cs (modified) (2 diffs)
• PermutationEncoding.cs (modified) (3 diffs)
• RealEncoding.cs (modified) (4 diffs)

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

@@ -48 +48 @@
     }
     public override IEnumerable<IValueParameter> Parameters {
-      get { return base.Parameters.Concat(new IValueParameter[] { LengthParameter }); }
+      get { return new IValueParameter[] { LengthParameter }; }
     }
     #endregion
@@ -73 +73 @@
       : base(name) {
       lengthParameter = new FixedValueParameter<IntValue>(Name + "Length", new IntValue(length));
+      SolutionCreator = new RandomBinaryVectorCreator();
       RegisterParameterEvents();
       DiscoverOperators();
-      SolutionCreator = Operators.OfType<RandomBinaryVectorCreator>().Single();
     }
 
@@ -106 +106 @@
       var discoveredTypes = ApplicationManager.Manager.GetTypes(encodingSpecificOperatorTypes, pluginDescription, true, false, false);
       var operators = discoveredTypes.Select(t => (IOperator)Activator.CreateInstance(t));
-      var newOperators = operators.Except(encodingOperators, new TypeEqualityComparer<IOperator>()).ToList();
+      var newOperators = operators.Except(Operators, new TypeEqualityComparer<IOperator>()).ToList();
 
       ConfigureOperators(newOperators);
-      encodingOperators.AddRange(newOperators);
+      foreach (var @operator in newOperators)
+        encodingOperators.Add(@operator);
     }
     #endregion

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);
     }
 

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

@@ -61 +61 @@
 
     public override IEnumerable<IValueParameter> Parameters {
-      get { return base.Parameters.Concat(new IValueParameter[] { LengthParameter, BoundsParameter }); }
+      get { return new IValueParameter[] { LengthParameter, BoundsParameter }; }
     }
     #endregion
@@ -94 +94 @@
       if (min >= max) throw new ArgumentException("min must be less than max", "min");
       if (step.HasValue && step.Value <= 0) throw new ArgumentException("step must be greater than zero or null", "step");
+
       Length = length;
       Bounds = new IntMatrix(1, step.HasValue ? 3 : 2);
@@ -99 +100 @@
       Bounds[0, 1] = max;
       if (step.HasValue) Bounds[0, 2] = step.Value;
+
+      SolutionCreator = new UniformRandomIntegerVectorCreator();
       RegisterParameterEvents();
       DiscoverOperators();
-      SolutionCreator = Operators.OfType<UniformRandomIntegerVectorCreator>().Single();
     }
     public IntegerEncoding(string name, int length, IList<int> min, IList<int> max, IList<int> step = null)
@@ -109 +111 @@
       if (step != null && min.Count != step.Count) throw new ArgumentException("step must be of the same length as min or null", "step");
       if (min.Zip(max, (mi, ma) => mi >= ma).Any(x => x)) throw new ArgumentException("min must be less than max in each dimension", "min");
+
       Length = length;
       Bounds = new IntMatrix(min.Count, step != null ? 3 : 2);
@@ -116 +119 @@
         if (step != null) Bounds[i, 2] = step[i];
       }
+
+      SolutionCreator = new UniformRandomIntegerVectorCreator();
       RegisterParameterEvents();
       DiscoverOperators();
-      SolutionCreator = Operators.OfType<UniformRandomIntegerVectorCreator>().Single();
     }
 
@@ -159 +163 @@
       var discoveredTypes = ApplicationManager.Manager.GetTypes(encodingSpecificOperatorTypes, true, false, false);
       var operators = discoveredTypes.Select(t => (IOperator)Activator.CreateInstance(t));
-      var newOperators = operators.Except(encodingOperators, new TypeEqualityComparer<IOperator>()).ToList();
+      var newOperators = operators.Except(Operators, new TypeEqualityComparer<IOperator>()).ToList();
 
       ConfigureOperators(newOperators);
-      encodingOperators.AddRange(newOperators);
+      foreach (var @operator in newOperators)
+        encodingOperators.Add(@operator);
     }
     #endregion

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;
     }
   }

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

@@ -60 +60 @@
 
     public override IEnumerable<IValueParameter> Parameters {
-      get { return base.Parameters.Concat(new IValueParameter[] { LengthParameter, PermutationTypeParameter }); }
+      get { return new IValueParameter[] { LengthParameter, PermutationTypeParameter }; }
     }
     #endregion
@@ -89 +89 @@
       RegisterParameterEvents();
     }
+
     public PermutationEncoding(string name, int length, PermutationTypes type)
       : base(name) {
       Length = length;
       Type = type;
+
+      SolutionCreator = new RandomPermutationCreator();
       RegisterParameterEvents();
       DiscoverOperators();
-      SolutionCreator = Operators.OfType<RandomPermutationCreator>().Single();
     }
 
@@ -138 +140 @@
       var discoveredTypes = ApplicationManager.Manager.GetTypes(encodingSpecificOperatorTypes, true, false, false);
       var operators = discoveredTypes.Select(t => (IOperator)Activator.CreateInstance(t));
-      var newOperators = operators.Except(encodingOperators, new TypeEqualityComparer<IOperator>()).ToList();
+      var newOperators = operators.Except(Operators, new TypeEqualityComparer<IOperator>()).ToList();
 
       ConfigureOperators(newOperators);
-      encodingOperators.AddRange(newOperators);
+      foreach (var @operator in newOperators)
+        encodingOperators.Add(@operator);
     }
     #endregion
 
     public override void ConfigureOperators(IEnumerable<IOperator> operators) {
-      base.ConfigureOperators(operators);
       ConfigureCreators(Operators.OfType<IPermutationCreator>());
       ConfigureCrossovers(Operators.OfType<IPermutationCrossover>());

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

@@ -62 +62 @@
 
     public override IEnumerable<IValueParameter> Parameters {
-      get { return base.Parameters.Concat(new IValueParameter[] { LengthParameter, BoundsParameter }); }
+      get { return new IValueParameter[] { LengthParameter, BoundsParameter }; }
     }
     #endregion
@@ -101 +101 @@
       lengthParameter = new FixedValueParameter<IntValue>(Name + "Length", new IntValue(length));
       boundsParameter = new ValueParameter<DoubleMatrix>(Name + "Bounds", bounds);
+
+      SolutionCreator = new UniformRandomRealVectorCreator();
       RegisterParameterEvents();
       DiscoverOperators();
-      SolutionCreator = Operators.OfType<UniformRandomRealVectorCreator>().Single();
     }
 
@@ -119 +120 @@
       lengthParameter = new FixedValueParameter<IntValue>(Name + "Length", new IntValue(length));
       boundsParameter = new ValueParameter<DoubleMatrix>(Name + "Bounds", bounds);
+
+      SolutionCreator = new UniformRandomRealVectorCreator();
       RegisterParameterEvents();
       DiscoverOperators();
-      SolutionCreator = Operators.OfType<UniformRandomRealVectorCreator>().Single();
     }
 
@@ -167 +169 @@
       var discoveredTypes = ApplicationManager.Manager.GetTypes(encodingSpecificOperatorTypes, true, false, false);
       var operators = discoveredTypes.Select(t => (IOperator)Activator.CreateInstance(t));
-      var newOperators = operators.Except(encodingOperators, new TypeEqualityComparer<IOperator>()).ToList();
+      var newOperators = operators.Except(Operators, new TypeEqualityComparer<IOperator>()).ToList();
 
       ConfigureOperators(newOperators);
-      encodingOperators.AddRange(newOperators);
+      foreach (var @operator in newOperators)
+        encodingOperators.Add(@operator);
 
       foreach (var strategyVectorCreator in Operators.OfType<IRealVectorStdDevStrategyParameterCreator>())