Changeset 10479 for branches/SpectralKernelForGaussianProcesses/HeuristicLab.Analysis

Timestamp:

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

Author:

gkronber

Message:

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

Location:

branches/SpectralKernelForGaussianProcesses

Files:

• . (modified) (1 prop)
• HeuristicLab.Analysis (modified) (1 prop)
• HeuristicLab.Analysis/3.3/MultiAnalyzer.cs (modified) (2 diffs)

branches/SpectralKernelForGaussianProcesses/HeuristicLab.Analysis/3.3/MultiAnalyzer.cs

@@ -69 +69 @@
     }
 
-    public override IOperation Apply() {
+    public override IOperation InstrumentedApply() {
       IntValue interval = UpdateIntervalParameter.ActualValue;
       if (interval == null) interval = new IntValue(1);
@@ -84 +84 @@
         foreach (IndexedItem<IAnalyzer> item in Operators.CheckedItems)
           next.Add(ExecutionContext.CreateOperation(item.Value));
-        next.Add(base.Apply());
+        next.Add(base.InstrumentedApply());
         return next;
       } else {
-        return base.Apply();
+        return base.InstrumentedApply();
       }
     }