Changeset 17699 for branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/Encoding.cs

Timestamp:

07/25/20 01:23:08 (4 years ago)

Author:

abeham

Message:

#2521: Made encodings non-generic classes (the TEncodedSolution type parameter is not actually used), this will make it considerably easier to port the VRP to the new architecture

File:

• branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/Encoding.cs (modified) (3 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/Encoding.cs

@@ -31 +31 @@
   [Item("Encoding", "Base class for describing different encodings.")]
   [StorableType("395B1372-FA54-4649-9EBE-5402A0AA9494")]
-  public abstract class Encoding<TEncodedSolution> : ParameterizedNamedItem, IEncoding<TEncodedSolution>
-    where TEncodedSolution : class, IEncodedSolution {
+  public abstract class Encoding : ParameterizedNamedItem, IEncoding {
     public sealed override bool CanChangeName {
       get { return false; }
@@ -48 +47 @@
       get { return encodingOperators; }
       set {
-        if (!value.OfType<ISolutionCreator<TEncodedSolution>>().Any())
-          throw new ArgumentException("The provided operators contain no suitable solution creator");
+        // SolutionCreator is now a parameter of the algorithm, we don't care!
+        //if (!value.OfType<ISolutionCreator<TEncodedSolution>>().Any())
+        //  throw new ArgumentException("The provided operators contain no suitable solution creator");
         encodingOperators.Clear();
         foreach (var op in value) encodingOperators.Add(op);
@@ -62 +62 @@
     private void AfterDeserialization() { }
 
-    protected Encoding(Encoding<TEncodedSolution> original, Cloner cloner)
+    protected Encoding(Encoding original, Cloner cloner)
       : base(original, cloner) {
       encodingOperators = cloner.Clone(original.encodingOperators);