Changeset 13372 for branches/ProblemRefactoring/HeuristicLab.Encodings.LinearLinkageEncoding

Timestamp:

11/24/15 17:22:41 (9 years ago)

Author:

mkommend

Message:

#2521: Fixed all problems.

Location:

branches/ProblemRefactoring/HeuristicLab.Encodings.LinearLinkageEncoding/3.3

Files:

• Interfaces/ILinearLinkageCreator.cs (modified) (1 diff)
• LinearLinkage.cs (modified) (2 diffs)
• LinearLinkageEncoding.cs (modified) (2 diffs)

branches/ProblemRefactoring/HeuristicLab.Encodings.LinearLinkageEncoding/3.3/Interfaces/ILinearLinkageCreator.cs

@@ -25 +25 @@
 
 namespace HeuristicLab.Encodings.LinearLinkageEncoding {
-  public interface ILinearLinkageCreator : ISolutionCreator, ILinearLinkageOperator {
+  public interface ILinearLinkageCreator : ISolutionCreator<LinearLinkage>, ILinearLinkageOperator {
     IValueLookupParameter<IntValue> LengthParameter { get; }
     ILookupParameter<LinearLinkage> LLEParameter { get; }

branches/ProblemRefactoring/HeuristicLab.Encodings.LinearLinkageEncoding/3.3/LinearLinkage.cs

@@ -26 +26 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
+using HeuristicLab.Optimization;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -31 +32 @@
   [Item("LinearLinkage", "Represents an LLE grouping of items.")]
   [StorableClass]
-  public sealed class LinearLinkage : IntArray {
+  public sealed class LinearLinkage : IntArray, ISolution {
 
     [StorableConstructor]

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

@@ -34 +34 @@
   [Item("Linear Linkage Encoding", "Describes a linear linkage (LLE) encoding.")]
   [StorableClass]
-  public sealed class LinearLinkageEncoding : Encoding<ILinearLinkageCreator> {
+  public sealed class LinearLinkageEncoding : Encoding<LinearLinkage> {
     #region encoding parameters
     [Storable]
@@ -166 +166 @@
     }
     #endregion
-  }
 
-  public static class IndividualExtensionMethods {
-    public static LinearLinkage LinearLinkage(this Individual individual) {
-      var encoding = individual.GetEncoding<LinearLinkageEncoding>();
-      return individual.LinearLinkage(encoding.Name);
-    }
-    public static LinearLinkage LinearLinkage(this Individual individual, string name) {
-      return (LinearLinkage)individual[name];
-    }
   }
 }