Changeset 14294 for trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/OnlinePearsonsRCalculator.cs

Timestamp:

09/20/16 17:14:41 (8 years ago)

Author:

bburlacu

Message:

#2672: Add cloning constructors.

File:

• trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/OnlinePearsonsRCalculator.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators/OnlinePearsonsRCalculator.cs

@@ -47 +47 @@
     public OnlinePearsonsRCalculator() { }
 
-    // private constructor used internally by the Clone() method
-    private OnlinePearsonsRCalculator(OnlineCovarianceCalculator covCalculator, OnlineMeanAndVarianceCalculator sxCalculator, OnlineMeanAndVarianceCalculator syCalculator) {
-      this.covCalculator = covCalculator;
-      this.sxCalculator = sxCalculator;
-      this.syCalculator = syCalculator;
+    protected OnlinePearsonsRCalculator(OnlinePearsonsRCalculator other, Cloner cloner) {
+      covCalculator = (OnlineCovarianceCalculator)other.covCalculator.Clone(cloner);
+      sxCalculator = (OnlineMeanAndVarianceCalculator)other.sxCalculator.Clone(cloner);
+      syCalculator = (OnlineMeanAndVarianceCalculator)other.syCalculator.Clone(cloner);
     }
 
@@ -101 +100 @@
     // IDeepCloneable members
     public object Clone() {
-      var covCalculatorClone = (OnlineCovarianceCalculator)covCalculator.Clone();
-      var sxCalculatorClone = (OnlineMeanAndVarianceCalculator)sxCalculator.Clone();
-      var syCalculatorClone = (OnlineMeanAndVarianceCalculator)syCalculator.Clone();
-      return new OnlinePearsonsRCalculator(covCalculatorClone, sxCalculatorClone, syCalculatorClone);
+      var cloner = new Cloner();
+      return new OnlinePearsonsRCalculator(this, cloner);
     }
 
@@ -110 +107 @@
       var clone = cloner.GetClone(this);
       if (clone == null) {
-        var covCalculatorClone = (OnlineCovarianceCalculator)covCalculator.Clone(cloner);
-        var sxCalculatorClone = (OnlineMeanAndVarianceCalculator)sxCalculator.Clone(cloner);
-        var syCalculatorClone = (OnlineMeanAndVarianceCalculator)syCalculator.Clone(cloner);
-        clone = new OnlinePearsonsRCalculator(covCalculatorClone, sxCalculatorClone, syCalculatorClone);
+        clone = new OnlinePearsonsRCalculator(this, cloner);
         cloner.RegisterClonedObject(this, clone);
       }