Context Navigation

Changeset 10507 for stable/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4

Timestamp:

02/25/14 14:00:47 (11 years ago)

Author:

mkommend

Message:

Location:

stable

Files:

stable
- Property svn:mergeinfo changed
  /trunk/sources merged: 10149,10231,10261,10291-10292,10295,10298
stable/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression
- Property svn:mergeinfo changed
  /trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression merged: 10291

-                      r9456
+                      r10507
     public override IEnumerable<bool> Maximization { get { return new bool[2] { false, false }; } }
     public override Core.IOperation Apply() {
+    public override IOperation InstrumentedApply() {
       IEnumerable<int> rows = GenerateRowsToEvaluate();
       var solution = SymbolicExpressionTreeParameter.ActualValue;
       double[] qualities = Calculate(SymbolicDataAnalysisTreeInterpreterParameter.ActualValue, solution, EstimationLimitsParameter.ActualValue.Lower, EstimationLimitsParameter.ActualValue.Upper, ProblemDataParameter.ActualValue, rows, ApplyLinearScalingParameter.ActualValue.Value);
       QualitiesParameter.ActualValue = new DoubleArray(qualities);
       return base.Apply();
+      return base.InstrumentedApply();
+    }

-                      r9456
+                      r10507
     public override IEnumerable<bool> Maximization { get { return new bool[2] { true, false }; } }
     public override IOperation Apply() {
+    public override IOperation InstrumentedApply() {
       IEnumerable<int> rows = GenerateRowsToEvaluate();
       var solution = SymbolicExpressionTreeParameter.ActualValue;
       double[] qualities = Calculate(SymbolicDataAnalysisTreeInterpreterParameter.ActualValue, solution, EstimationLimitsParameter.ActualValue.Lower, EstimationLimitsParameter.ActualValue.Upper, ProblemDataParameter.ActualValue, rows, ApplyLinearScalingParameter.ActualValue.Value);
       QualitiesParameter.ActualValue = new DoubleArray(qualities);
       return base.Apply();
+      return base.InstrumentedApply();
+    }

-                      r9456
+                      r10507
+    }
     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
+                      r10507
     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
+                      r10507
     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
+                      r10507
     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
+                      r10507
     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.