Changeset 10416 for branches

Timestamp:

01/28/14 19:25:26 (11 years ago)

Author:

ascheibe

Message:

#1886 adapted branch to changes of #2119

Location:

branches/HeuristicLab.Analysis.AlgorithmBehavior

Files:

• HeuristicLab.Analysis.AlgorithmBehavior.Analyzers/3.3/AfterCrossoverCombinedOperator.cs (modified) (1 diff)
• HeuristicLab.Analysis.AlgorithmBehavior.Analyzers/3.3/AfterMutationCombinedOperator.cs (modified) (1 diff)
• HeuristicLab.Analysis.AlgorithmBehavior.Analyzers/3.3/CombinedOperator.cs (modified) (1 diff)
• HeuristicLab.Analysis.SolutionCaching/3.3/Algorithm/ParallelOperatorProcessor.cs (modified) (1 diff)

branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers/3.3/AfterCrossoverCombinedOperator.cs

@@ -106 +106 @@
     }
 
-    public override IOperation Apply() {
+    public override IOperation InstrumentedApply() {
       if (GenerationsParameter.ActualValue.Value % UpdateIntervalParameter.Value.Value == 0) {
-        return base.Apply();
+        return base.InstrumentedApply();
       } else {
         return base.BaseApply();

branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers/3.3/AfterMutationCombinedOperator.cs

@@ -97 +97 @@
     }
 
-    public override IOperation Apply() {
+    public override IOperation InstrumentedApply() {
       if (GenerationsParameter.ActualValue.Value % UpdateIntervalParameter.Value.Value == 0) {
-        return base.Apply();
+        return base.InstrumentedApply();
       } else {
         return base.BaseApply();

branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers/3.3/CombinedOperator.cs

@@ -55 +55 @@
 
     protected IOperation BaseApply() {
-      return base.Apply();
+      return base.InstrumentedApply();
     }
 
-    public override IOperation Apply() {
+    public override IOperation InstrumentedApply() {
       if (Operators.Count == 0)
         InitializeOperators();
 
-      OperationCollection next = new OperationCollection(base.Apply());
+      OperationCollection next = new OperationCollection(base.InstrumentedApply());
       OperationCollection inner = new OperationCollection();
       inner.Parallel = false;

branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.SolutionCaching/3.3/Algorithm/ParallelOperatorProcessor.cs

@@ -55 +55 @@
     }
 
-    public override IOperation Apply() {
-      OperationCollection next = new OperationCollection(base.Apply());
+    public override IOperation InstrumentedApply() {
+      OperationCollection next = new OperationCollection(base.InstrumentedApply());
       OperationCollection inner = new OperationCollection();
       inner.Parallel = Parallel != null && Parallel.Value;