Changeset 10479 for branches/SpectralKernelForGaussianProcesses/HeuristicLab.Encodings.PermutationEncoding/3.3/Manipulators/MultiPermutationManipulator.cs

Timestamp:

02/20/14 14:29:01 (6 years ago)

Author:

gkronber

Message:

#2124 merged all changes from trunk to prepare for trunk-reintegration

Location:

branches/SpectralKernelForGaussianProcesses

Files:

• . (modified) (1 prop)
• HeuristicLab.Encodings.PermutationEncoding (modified) (1 prop)
• HeuristicLab.Encodings.PermutationEncoding/3.3/Manipulators/MultiPermutationManipulator.cs (modified) (2 diffs)

branches/SpectralKernelForGaussianProcesses/HeuristicLab.Encodings.PermutationEncoding/3.3/Manipulators/MultiPermutationManipulator.cs

@@ -57 +57 @@
           Operators.Add((IPermutationManipulator)Activator.CreateInstance(type), true);
       }
+
+      SelectedOperatorParameter.ActualName = "SelectedManipulationOperator";
     }
 
@@ -82 +84 @@
     }
 
-    public override IOperation Apply() {
+    public override IOperation InstrumentedApply() {
       if (Operators.Count == 0) throw new InvalidOperationException(Name + ": Please add at least one permutation manipulator to choose from.");
-      return base.Apply();
+      return base.InstrumentedApply();
     }
   }