Changeset 10483 for branches/LogResidualEvaluator/HeuristicLab.Encodings.ScheduleEncoding/3.3/JobSequenceMatrix/Crossovers/JSMCrossover.cs

Timestamp:

02/20/14 14:56:39 (11 years ago)

Author:

gkronber

Message:

#2093: merged trunk changes to prepare for reintegration

Location:

branches/LogResidualEvaluator

Files:

• . (modified) (1 prop)
• HeuristicLab.Encodings.ScheduleEncoding/3.3/JobSequenceMatrix/Crossovers/JSMCrossover.cs (modified) (2 diffs)

branches/LogResidualEvaluator/HeuristicLab.Encodings.ScheduleEncoding/3.3/JobSequenceMatrix/Crossovers/JSMCrossover.cs

@@ -40 +40 @@
     public abstract JSMEncoding Cross(IRandom random, JSMEncoding parent1, JSMEncoding parent2);
 
-    public override IOperation Apply() {
+    public override IOperation InstrumentedApply() {
       var parents = ParentsParameter.ActualValue;
 
@@ -46 +46 @@
         Cross(RandomParameter.ActualValue, parents[0] as JSMEncoding, parents[1] as JSMEncoding);
 
-      return base.Apply();
+      return base.InstrumentedApply();
     }
   }