Changeset 13336 for branches/ProblemRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding

Timestamp:

11/23/15 15:15:27 (9 years ago)

Author:

mkommend

Message:

#2521: Refactored encodings and problems.

Location:

branches/ProblemRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding/3.3

Files:

• BinaryVector.cs (modified) (2 diffs)
• BinaryVectorEncoding.cs (modified) (2 diffs)
• Interfaces/IBinaryVectorCreator.cs (modified) (1 diff)

branches/ProblemRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/BinaryVector.cs ¶

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

branches/ProblemRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/BinaryVectorEncoding.cs ¶

@@ -34 +34 @@
   [Item("BinaryVectorEncoding", "Describes a binary vector encoding.")]
   [StorableClass]
-  public sealed class BinaryVectorEncoding : Encoding<IBinaryVectorCreator> {
+  public sealed class BinaryVectorEncoding : Encoding<BinaryVector> {
     #region Encoding Parameters
     [Storable]
@@ -166 +166 @@
     #endregion
   }
-
-  public static class IndividualExtensionMethods {
-    public static BinaryVector BinaryVector(this Individual individual) {
-      var encoding = individual.GetEncoding<BinaryVectorEncoding>();
-      return individual.BinaryVector(encoding.Name);
-    }
-
-    public static BinaryVector BinaryVector(this Individual individual, string name) {
-      return (BinaryVector)individual[name];
-    }
-  }
 }

branches/ProblemRefactoring/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/Interfaces/IBinaryVectorCreator.cs ¶

@@ -28 +28 @@
   /// An interface which represents an operator for creating vectors of bool-valued data.
   /// </summary>
-  public interface IBinaryVectorCreator : IBinaryVectorOperator, ISolutionCreator {
+  public interface IBinaryVectorCreator : IBinaryVectorOperator, ISolutionCreator<BinaryVector> {
     IValueLookupParameter<IntValue> LengthParameter { get; }
     ILookupParameter<BinaryVector> BinaryVectorParameter { get; }