Changeset 13361 for branches/ProblemRefactoring/HeuristicLab.Encodings.RealVectorEncoding/3.3

Timestamp:

11/24/15 16:01:02 (9 years ago)

Author:

mkommend

Message:

#2521: Adapted real vector encoding, test function problems, P3, CMA-ES and optimization.

Location:

branches/ProblemRefactoring/HeuristicLab.Encodings.RealVectorEncoding/3.3

Files:

• Interfaces/IRealVectorCreator.cs (modified) (1 diff)
• RealVector.cs (modified) (2 diffs)
• RealVectorEncoding.cs (modified) (3 diffs)

branches/ProblemRefactoring/HeuristicLab.Encodings.RealVectorEncoding/3.3/Interfaces/IRealVectorCreator.cs

@@ -28 +28 @@
   /// An interface which represents an operator for creating vectors of real-valued data.
   /// </summary>
-  public interface IRealVectorCreator : IRealVectorOperator, ISolutionCreator {
+  public interface IRealVectorCreator : IRealVectorOperator, ISolutionCreator<RealVector> {
     IValueLookupParameter<IntValue> LengthParameter { get; }
     IValueLookupParameter<DoubleMatrix> BoundsParameter { get; }

branches/ProblemRefactoring/HeuristicLab.Encodings.RealVectorEncoding/3.3/RealVector.cs

@@ -23 +23 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
+using HeuristicLab.Optimization;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -28 +29 @@
   [StorableClass]
   [Item("RealVector", "Represents a vector of real values.")]
-  public class RealVector : DoubleArray {
+  public class RealVector : DoubleArray, ISolution {
     [StorableConstructor]
     protected RealVector(bool deserializing) : base(deserializing) { }

branches/ProblemRefactoring/HeuristicLab.Encodings.RealVectorEncoding/3.3/RealVectorEncoding.cs

@@ -34 +34 @@
   [Item("RealVectorEncoding", "Describes a real vector encoding.")]
   [StorableClass]
-  public sealed class RealVectorEncoding : Encoding<IRealVectorCreator> {
+  public sealed class RealVectorEncoding : Encoding<RealVector> {
     #region Encoding Parameters
     [Storable]
@@ -95 +95 @@
     public RealVectorEncoding(string name) : this(name, 10) { }
     public RealVectorEncoding(int length) : this("RealVector", length) { }
-    public RealVectorEncoding(string name, int length, double min = double.MinValue, double max = double.MaxValue)
+    public RealVectorEncoding(string name, int length, double min = -1000, double max = 1000)
       : base(name) {
       if (min >= max) throw new ArgumentException("min must be less than max", "min");
@@ -318 +318 @@
     #endregion
   }
-
-  public static class IndividualExtensionMethods {
-    public static RealVector RealVector(this Individual individual) {
-      var encoding = individual.GetEncoding<RealVectorEncoding>();
-      return individual.RealVector(encoding.Name);
-    }
-    public static RealVector RealVector(this Individual individual, string name) {
-      return (RealVector)individual[name];
-    }
-  }
 }