Changeset 11543 for branches

Timestamp:

11/12/14 17:52:15 (10 years ago)

Author:

mkommend

Message:

#2174: Refactoring of encodings to allow wiring of operators within the encoding instead of the problem (work in progress).

Location:

branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3

Files:

• Encodings/Encoding.cs (modified) (3 diffs)
• Encodings/RealEncoding.cs (modified) (4 diffs)
• HeuristicLab.Problems.Programmable-3.3.csproj (modified) (1 diff)
• Interfaces/IEncoding.cs (added)
• MultiObjectiveProgrammableProblem.cs (modified) (3 diffs)
• ProblemDefinition.cs (modified) (1 diff)
• SingleObjectiveProgrammableProblem.cs (modified) (3 diffs)

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

@@ -21 +21 @@
 
 using System;
+using System.Collections.Generic;
+using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -28 +30 @@
   [Item("Encoding", "Base class for describing different encodings.")]
   [StorableClass]
-  public abstract class Encoding : NamedItem {
-    public override bool CanChangeName {
+  public abstract class Encoding : NamedItem, IEncoding {
+    public override sealed bool CanChangeName {
       get { return false; }
     }
@@ -39 +41 @@
     protected Encoding(string name) : base(name) { }
 
+    public virtual IEnumerable<IValueParameter> EncodingParameters {
+      get { return Enumerable.Empty<IValueParameter>(); }
+    }
 
-    public event EventHandler ParameterConfigurationChanged;
+    //public event EventHandler ParameterConfigurationChanged;
     protected virtual void OnParameterConfigurationChanged() {
-      var handler = ParameterConfigurationChanged;
-      if (handler != null) handler(this, EventArgs.Empty);
+    //  var handler = ParameterConfigurationChanged;
+    //  if (handler != null) handler(this, EventArgs.Empty);
     }
   }

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

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Linq;
+using System.Text;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
+using HeuristicLab.Encodings.RealVectorEncoding;
+using HeuristicLab.Optimization;
+using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -31 +35 @@
   [Item("RealEncoding", "Describes a real vector encoding.")]
   [StorableClass]
-  public class RealEncoding : Encoding {
+  public sealed class RealEncoding : Encoding {
+
     [Storable]
-    private IntValue length;
-    public IntValue Length {
-      get { return length; }
+    private IFixedValueParameter<IntValue> lengthParameter;
+    public IFixedValueParameter<IntValue> LengthParameter {
+      get { return lengthParameter; }
       set {
-        if (length == value) return;
-        length = value;
-        OnParameterConfigurationChanged();
+        if(value == null) throw new ArgumentNullException("Length parameter must not be null.");
+        if (lengthParameter == value) return;
+        lengthParameter = value;
+        OnLengthParameterChanged();
       }
     }
 
     [Storable]
-    private DoubleMatrix bounds;
-    public DoubleMatrix Bounds {
-      get { return bounds; }
+    private IValueParameter<DoubleMatrix> boundsParameter;
+    public IValueParameter<DoubleMatrix> BoundsParameter {
+      get { return boundsParameter; }
       set {
-        if (bounds == value) return;
-        bounds = value;
-        OnParameterConfigurationChanged();
+        if (value == null) throw new ArgumentNullException("Bounds parameter must not be null.");
+        if (boundsParameter == value) return;
+        boundsParameter = value;
+        OnBoundsParameterChanged();
       }
     }
 
+    public override IEnumerable<IValueParameter> EncodingParameters {
+      get { return base.EncodingParameters.Concat(new IValueParameter[] { LengthParameter, BoundsParameter }); }
+    }
+
+    public int Length {
+      get { return LengthParameter.Value.Value; }
+      set { LengthParameter.Value.Value = value; }
+    }
+    public DoubleMatrix Bounds {
+      get { return BoundsParameter.Value; }
+      set { BoundsParameter.Value = value; }
+    }
+
+    public ISolutionCreator SolutionCreator {
+      get {
+        var creator = new UniformRandomRealVectorCreator();
+        creator.RealVectorParameter.ActualName = Name;
+        creator.LengthParameter.ActualName = LengthParameter.Name;
+        creator.BoundsParameter.ActualName = BoundsParameter.Name;
+        return creator;
+      }
+    }
+      
     [StorableConstructor]
-    protected RealEncoding(bool deserializing) : base(deserializing) { }
-    protected RealEncoding(RealEncoding original, Cloner cloner)
+    private RealEncoding(bool deserializing) : base(deserializing) { }
+    private RealEncoding(RealEncoding original, Cloner cloner)
       : base(original, cloner) {
-      length = cloner.Clone(original.length);
-      bounds = cloner.Clone(original.bounds);
+      lengthParameter = cloner.Clone(original.lengthParameter);
+      boundsParameter = cloner.Clone(original.boundsParameter);
     }
     public RealEncoding(string name, int length, double min, double max)
       : base(name) {
       if (min >= max) throw new ArgumentException("min must be less than max", "min");
-      this.length = new IntValue(length);
-      bounds = new DoubleMatrix(1, 2);
+
+      var bounds = new DoubleMatrix(1, 2);
       bounds[0, 0] = min;
       bounds[0, 1] = max;
+
+      lengthParameter = new FixedValueParameter<IntValue>(Name + "Length", new IntValue(length));
+      boundsParameter = new ValueParameter<DoubleMatrix>(Name + "Bounds", bounds);
     }
     public RealEncoding(string name, int length, IList<double> min, IList<double> max)
@@ -74 +107 @@
       if (min.Count != max.Count) throw new ArgumentException("min must be of the same length as max", "min");
       if (min.Zip(max, (mi, ma) => mi >= ma).Any(x => x)) throw new ArgumentException("min must be less than max in each dimension", "min");
-      this.length = new IntValue(length);
-      bounds = new DoubleMatrix(min.Count, 2);
+
+      var bounds = new DoubleMatrix(min.Count, 2);
       for (int i = 0; i < min.Count; i++) {
         bounds[i, 0] = min[i];
         bounds[i, 1] = max[i];
       }
-    }
+      lengthParameter = new FixedValueParameter<IntValue>(Name + "Length", new IntValue(length));
+      boundsParameter = new ValueParameter<DoubleMatrix>(Name + "Bounds", bounds);
+    }  
 
     public override IDeepCloneable Clone(Cloner cloner) {
@@ -86 +121 @@
     }
 
+    private void OnLengthParameterChanged() {
+       //TODO rewire parameters
+    }
+
+    private void OnBoundsParameterChanged() {
+      //TODO rewire parameters      
+    }
+
+
   }
-}
+}                            

branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/HeuristicLab.Problems.Programmable-3.3.csproj

@@ -139 +139 @@
     <Compile Include="Encodings\Individual.cs" />
     <Compile Include="Helper.cs" />
+    <Compile Include="Interfaces\IEncoding.cs" />
     <Compile Include="Interfaces\ISingleObjectiveMoveOperator.cs" />
     <Compile Include="Interfaces\IMultiObjectiveProblemDefinition.cs" />

branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/MultiObjectiveProgrammableProblem.cs

@@ -140 +140 @@
       if (definition == null) return;
 
-      Encoding encoding;
-      try {
-        encoding = definition.Encoding;
-      } catch { return; }
+      Encoding encoding = definition.Encoding;
       EncodingParameter.Value = encoding;
       Maximization = new BoolArray(definition.Maximization);
@@ -220 +217 @@
       var realEnc = encoding as RealEncoding;
       if (realEnc != null) {
-        var l = new ValueParameter<IntValue>(realEnc.Name + "Length", realEnc.Length);
-        var b = new ValueParameter<DoubleMatrix>(realEnc.Name + "Bounds", realEnc.Bounds);
-        DynamicEncodingParameters.Add(l);
-        DynamicEncodingParameters.Add(b);
-
-        var creator = new UniformRandomRealVectorCreator();
-        creator.RealVectorParameter.ActualName = realEnc.Name;
-        creator.LengthParameter.ActualName = l.Name;
-        creator.BoundsParameter.ActualName = b.Name;
-        return creator;
+        DynamicEncodingParameters.AddRange(realEnc.EncodingParameters);
+        return realEnc.SolutionCreator;
       }
       #endregion
@@ -458 +447 @@
           .Union(ApplicationManager.Manager.GetInstances<IRealVectorStdDevStrategyParameterOperator>(), new TypeEqualityComparer<IRealVectorStdDevStrategyParameterOperator>())
           .ToList();
-        var problemSize = ((RealEncoding)encoding).Length.Value;
+        var problemSize = ((RealEncoding)encoding).Length;
         var bounds = (DoubleMatrix)((RealEncoding)encoding).Bounds.Clone();
         for (var i = 0; i < bounds.Rows; i++) {

branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/ProblemDefinition.cs

@@ -35 +35 @@
       get { return encoding; }
       protected set {
+        if (value == null) throw new ArgumentNullException("The encoding must not be null.");
         if (encoding == value) return;
         encoding = value;

branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/SingleObjectiveProgrammableProblem.cs

@@ -143 +143 @@
       if (definition == null) return;
 
-      Encoding encoding;
-      try {
-        encoding = definition.Encoding;
-      } catch { return; }
+      Encoding encoding = definition.Encoding;
+
       EncodingParameter.Value = encoding;
       Maximization.Value = definition.IsMaximizationProblem;
@@ -225 +223 @@
       var realEnc = encoding as RealEncoding;
       if (realEnc != null) {
-        var l = new ValueParameter<IntValue>(realEnc.Name + "Length", realEnc.Length);
-        var b = new ValueParameter<DoubleMatrix>(realEnc.Name + "Bounds", realEnc.Bounds);
-        DynamicEncodingParameters.Add(l);
-        DynamicEncodingParameters.Add(b);
-
-        var creator = new UniformRandomRealVectorCreator();
-        creator.RealVectorParameter.ActualName = realEnc.Name;
-        creator.LengthParameter.ActualName = l.Name;
-        creator.BoundsParameter.ActualName = b.Name;
-        return creator;
+        DynamicEncodingParameters.AddRange(realEnc.EncodingParameters);        
+        return realEnc.SolutionCreator;
       }
       #endregion
@@ -463 +453 @@
           .Union(ApplicationManager.Manager.GetInstances<IRealVectorStdDevStrategyParameterOperator>(), new TypeEqualityComparer<IRealVectorStdDevStrategyParameterOperator>())
           .ToList();
-        var problemSize = ((RealEncoding)encoding).Length.Value;
+        var problemSize = ((RealEncoding)encoding).Length;
         var bounds = (DoubleMatrix)((RealEncoding)encoding).Bounds.Clone();
         for (var i = 0; i < bounds.Rows; i++) {