Context Navigation

SingleObjective

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:

Property svn:mergeinfo changed

/branches/HLScript (added)	merged: 10331-10332,10358
/trunk/sources (added)	merged: 10212-10213,10231,10261,10273,10291-10292,10295,10298,10323-10324,10346,10348,10355,10359-10360,10362-10363,10365-10366,10368,10375,10378,10391,10401,10406-10407,10414,10417-10418,10428,10432-10433,10435,10440,10448,10453,10460,10465-10466,10469-10470,10472,10474-10477

Property svn:mergeinfo changed

/branches/HLScript/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression (added)	merged: 10358
/trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression (added)	merged: 10291,10355,10359,10368,10375,10378,10432,10469

-                      r9456
+                      r10479
+    }
     public override IOperation Apply() {
+    public override IOperation InstrumentedApply() {
       var solution = SymbolicExpressionTreeParameter.ActualValue;
       double quality;
 …
       QualityParameter.ActualValue = new DoubleValue(quality);
+      if (Successor != null)
+        return ExecutionContext.CreateOperation(Successor);
+      else
+        return null;
+      return base.InstrumentedApply();
+    }

-                      r9456
+                      r10479
     public SymbolicRegressionSingleObjectiveMaxAbsoluteErrorEvaluator() : base() { }
     public override IOperation Apply() {
+    public override IOperation InstrumentedApply() {
       var solution = SymbolicExpressionTreeParameter.ActualValue;
       IEnumerable<int> rows = GenerateRowsToEvaluate();
 …
       QualityParameter.ActualValue = new DoubleValue(quality);
       return base.Apply();
+      return base.InstrumentedApply();
+    }

-                      r9456
+                      r10479
     public SymbolicRegressionSingleObjectiveMeanAbsoluteErrorEvaluator() : base() { }
     public override IOperation Apply() {
+    public override IOperation InstrumentedApply() {
       var solution = SymbolicExpressionTreeParameter.ActualValue;
       IEnumerable<int> rows = GenerateRowsToEvaluate();
 …
       QualityParameter.ActualValue = new DoubleValue(quality);
       return base.Apply();
+      return base.InstrumentedApply();
+    }

-                      r9456
+                      r10479
     public SymbolicRegressionSingleObjectiveMeanSquaredErrorEvaluator() : base() { }
     public override IOperation Apply() {
+    public override IOperation InstrumentedApply() {
       var solution = SymbolicExpressionTreeParameter.ActualValue;
       IEnumerable<int> rows = GenerateRowsToEvaluate();
 …
       QualityParameter.ActualValue = new DoubleValue(quality);
       return base.Apply();
+      return base.InstrumentedApply();
+    }

-                      r9456
+                      r10479
     public override bool Maximization { get { return true; } }
     public override IOperation Apply() {
+    public override IOperation InstrumentedApply() {
       var solution = SymbolicExpressionTreeParameter.ActualValue;
       IEnumerable<int> rows = GenerateRowsToEvaluate();
 …
       QualityParameter.ActualValue = new DoubleValue(quality);
       return base.Apply();
+      return base.InstrumentedApply();
+    }

Note: See TracChangeset for help on using the changeset viewer.