Changeset 13364 for branches/ProblemRefactoring/HeuristicLab.Encodings.IntegerVectorEncoding/3.3

Timestamp:

11/24/15 16:42:09 (9 years ago)

Author:

mkommend

Message:

#2521: Refactored IntegerVectorEncoding, KnapsackProblem, and P3.

Location:

branches/ProblemRefactoring/HeuristicLab.Encodings.IntegerVectorEncoding/3.3

Files:

• IntegerVector.cs (modified) (2 diffs)
• IntegerVectorEncoding.cs (modified) (2 diffs)
• Interfaces/IIntegerVectorCreator.cs (modified) (1 diff)

branches/ProblemRefactoring/HeuristicLab.Encodings.IntegerVectorEncoding/3.3/IntegerVector.cs

@@ -24 +24 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
+using HeuristicLab.Optimization;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -29 +30 @@
   [StorableClass]
   [Item("IntegerVector", "Represents a vector of integer values.")]
-  public class IntegerVector : IntArray {
+  public class IntegerVector : IntArray, ISolution {
     [StorableConstructor]
     protected IntegerVector(bool deserializing) : base(deserializing) { }

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

@@ -34 +34 @@
   [Item("IntegerVectorEncoding", "Describes an integer vector encoding.")]
   [StorableClass]
-  public sealed class IntegerVectorEncoding : Encoding<IIntegerVectorCreator> {
+  public sealed class IntegerVectorEncoding : Encoding<IntegerVector> {
     #region Encoding Parameters
     [Storable]
@@ -271 +271 @@
     #endregion
   }
-
-  public static class IndividualExtensionMethods {
-    public static IntegerVector IntegerVector(this Individual individual) {
-      var encoding = individual.GetEncoding<IntegerVectorEncoding>();
-      return individual.IntegerVector(encoding.Name);
-    }
-    public static IntegerVector IntegerVector(this Individual individual, string name) {
-      return (IntegerVector)individual[name];
-    }
-  }
 }

branches/ProblemRefactoring/HeuristicLab.Encodings.IntegerVectorEncoding/3.3/Interfaces/IIntegerVectorCreator.cs

@@ -28 +28 @@
   /// An interface which represents an operator for creating vectors of int-valued data.
   /// </summary>
-  public interface IIntegerVectorCreator : ISolutionCreator, IBoundedIntegerVectorOperator {
+  public interface IIntegerVectorCreator : ISolutionCreator<IntegerVector>, IBoundedIntegerVectorOperator {
     IValueLookupParameter<IntValue> LengthParameter { get; }
     ILookupParameter<IntegerVector> IntegerVectorParameter { get; }