Changeset 11598 for branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/Encodings/MultiEncoding.cs

Timestamp:

11/27/14 20:02:35 (9 years ago)

Author:

mkommend

Message:

#2174: Added first version of refactored individuals.

File:

• branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/Encodings/MultiEncoding.cs (modified) (5 diffs)

branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/Encodings/MultiEncoding.cs

@@ -27 +27 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.PluginInfrastructure;
+using HeuristicLab.Problems.Programmable.Encodings;
 using HeuristicLab.Problems.Programmable.Interfaces;
 
@@ -32 +33 @@
   [Item("MultiEncoding", "Describes a combined encoding consisting of multiple simpler encodings.")]
   [StorableClass]
-  public class MultiEncoding : Encoding<MultiEncodingCreator> {
+  public sealed class MultiEncoding : Encoding<MultiEncodingCreator> {
 
     private readonly List<IEncoding> encodings;
@@ -43 +44 @@
 
     [StorableConstructor]
-    protected MultiEncoding(bool deserializing)
+    private MultiEncoding(bool deserializing)
       : base(deserializing) {
       encodings = new List<IEncoding>();
@@ -49 +50 @@
 
     public override IDeepCloneable Clone(Cloner cloner) { return new MultiEncoding(this, cloner); }
-    protected MultiEncoding(MultiEncoding original, Cloner cloner)
+    private MultiEncoding(MultiEncoding original, Cloner cloner)
       : base(original, cloner) {
       encodings = new List<IEncoding>(original.Encodings.Select(cloner.Clone));
@@ -60 +61 @@
       foreach (var @operator in ApplicationManager.Manager.GetInstances<IMultiEncodingOperator>())
         encodingOperators.Add(@operator);
+    }
+
+    public override Individual CreateIndividual(IScope scope) {
+      return new MultiEncodingIndividual(this, scope);
     }