Changeset 11543 for branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/Encodings/RealEncoding.cs

Timestamp:

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

Author:

mkommend

Message:

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

File:

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

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