Changeset 11587 for branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/Operators/MultiEncodingManipulator.cs

Timestamp:

11/26/14 13:24:20 (10 years ago)

Author:

mkommend

Message:

#2174: Implemented multi-encoding operators and adapated wiring of operators in the programmable problems.

File:

• branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/Operators/MultiEncodingManipulator.cs (modified) (1 diff)

branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/Operators/MultiEncodingManipulator.cs

@@ -20 +20 @@
 #endregion
 
-using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Operators;
 using HeuristicLab.Optimization;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Problems.Programmable.Operators;
 
 namespace HeuristicLab.Problems.Programmable {
-  [Item("MultiEncoding Manipulator", "Applies different manipulators to change a multiencoding.")]
+  [Item("MultiEncoding Manipulator", "Applies different manipulators to change a multi-encoding.")]
   [StorableClass]
-  public class MultiEncodingManipulator : MultiOperator<IManipulator>, IManipulator {
+  public sealed class MultiEncodingManipulator : MultiEncodingOperator<IManipulator>, IManipulator {
+    [StorableConstructor]
+    private MultiEncodingManipulator(bool deserializing) : base(deserializing) { }
+    private MultiEncodingManipulator(MultiEncodingManipulator original, Cloner cloner)
+      : base(original, cloner) { }
+    public MultiEncodingManipulator() { }
 
-    [StorableConstructor]
-    protected MultiEncodingManipulator(bool deserializing) : base(deserializing) { }
-    protected MultiEncodingManipulator(MultiEncodingManipulator original, Cloner cloner)
-      : base(original, cloner) { }
-    public MultiEncodingManipulator() {
-    }
+    public override IDeepCloneable Clone(Cloner cloner) { return new MultiEncodingManipulator(this, cloner); }
 
-    public override IDeepCloneable Clone(Cloner cloner) {
-      return new MultiEncodingManipulator(this, cloner);
-    }
-
-    public override IOperation InstrumentedApply() {
-      var baseOperations = base.InstrumentedApply();
-      return new OperationCollection(new[] { baseOperations }.Concat(Operators.Select(x => ExecutionContext.CreateOperation(x))));
-    }
   }
 }