Changeset 14294 for trunk/sources

Timestamp:

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

Author:

bburlacu

Message:

#2672: Add cloning constructors.

Location:

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

Files:

• ClassificationPerformanceMeasuresCalculator.cs (modified) (2 diffs)
• OnlineAccuracyCalculator.cs (modified) (2 diffs)
• OnlineBoundedMeanSquaredErrorCalculator.cs (modified) (2 diffs)
• OnlineCovarianceCalculator.cs (modified) (2 diffs)
• OnlineDirectionalSymmetryCalculator.cs (modified) (2 diffs)
• OnlineLinearScalingParameterCalculator.cs (modified) (3 diffs)
• OnlineMaxAbsoluteErrorCalculator.cs (modified) (2 diffs)
• OnlineMeanAbsoluteErrorCalculator.cs (modified) (2 diffs)
• OnlineMeanAbsolutePercentageErrorCalculator.cs (modified) (2 diffs)
• OnlineMeanAndVarianceCalculator.cs (modified) (2 diffs)
• OnlineMeanErrorCalculator.cs (modified) (3 diffs)
• OnlineMeanSquaredErrorCalculator.cs (modified) (2 diffs)
• OnlineNormalizedMeanSquaredErrorCalculator.cs (modified) (3 diffs)
• OnlinePearsonsRCalculator.cs (modified) (3 diffs)
• OnlinePearsonsRSquaredCalculator.cs (modified) (3 diffs)
• OnlineTheilsUStatisticCalculator.cs (modified) (3 diffs)
• OnlineWeightedDirectionalSymmetryCalculator.cs (modified) (2 diffs)

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

@@ -33 +33 @@
     }
 
-    // private constructor used internally by the Clone() method
-    private ClassificationPerformanceMeasuresCalculator(ClassificationPerformanceMeasuresCalculator other) {
-      // copy everything including the errorState
-      positiveClassName = other.positiveClassName;
-      positiveClassValue = other.positiveClassValue;
-      truePositiveCount = other.truePositiveCount;
-      falsePositiveCount = other.falsePositiveCount;
-      trueNegativeCount = other.trueNegativeCount;
-      falseNegativeCount = other.falseNegativeCount;
-      errorState = other.errorState;
+    protected ClassificationPerformanceMeasuresCalculator(ClassificationPerformanceMeasuresCalculator original, Cloner cloner = null) {
+      positiveClassName = original.positiveClassName;
+      positiveClassValue = original.positiveClassValue;
+      truePositiveCount = original.truePositiveCount;
+      falsePositiveCount = original.falsePositiveCount;
+      trueNegativeCount = original.trueNegativeCount;
+      falseNegativeCount = original.falseNegativeCount;
+      errorState = original.errorState;
     }
 
@@ -158 +156 @@
       var clone = cloner.GetClone(this);
       if (clone == null) {
-        clone = (IDeepCloneable)this.Clone();
+        clone = new ClassificationPerformanceMeasuresCalculator(this);
         cloner.RegisterClonedObject(this, clone);
       }

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

@@ -40 +40 @@
 
     // private constructor used internally by the Clone() method
-    private OnlineAccuracyCalculator(OnlineAccuracyCalculator other) {
+    protected OnlineAccuracyCalculator(OnlineAccuracyCalculator other, Cloner cloner = null) {
       correctlyClassified = other.correctlyClassified;
       n = other.n;
@@ -106 +106 @@
       var clone = cloner.GetClone(this);
       if (clone == null) {
-        clone = (IDeepCloneable)this.Clone();
+        clone = new OnlineAccuracyCalculator(this);
         cloner.RegisterClonedObject(this, clone);
       }

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

@@ -45 +45 @@
     }
 
-    // private constructor used internally by the Clone() method
-    private OnlineBoundedMeanSquaredErrorCalculator(OnlineBoundedMeanSquaredErrorCalculator other) {
-      LowerBound = other.LowerBound;
-      UpperBound = other.UpperBound;
-      n = other.n;
-      errorSum = other.errorSum;
-      errorState = other.ErrorState;
+    protected OnlineBoundedMeanSquaredErrorCalculator(OnlineBoundedMeanSquaredErrorCalculator original, Cloner cloner = null) {
+      LowerBound = original.LowerBound;
+      UpperBound = original.UpperBound;
+      n = original.n;
+      errorSum = original.errorSum;
+      errorState = original.ErrorState;
     }
 
@@ -115 +114 @@
       var clone = cloner.GetClone(this);
       if (clone == null) {
-        clone = (IDeepCloneable)this.Clone();
+        clone = new OnlineBoundedMeanSquaredErrorCalculator(this);
         cloner.RegisterClonedObject(this, clone);
       }

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

@@ -39 +39 @@
     }
 
-    // private constructor used internally by the Clone() method
-    private OnlineCovarianceCalculator(OnlineCovarianceCalculator other) : this() {
+    protected OnlineCovarianceCalculator(OnlineCovarianceCalculator other, Cloner cloner = null) {
       Cn = other.Cn;
       xMean = other.xMean;
@@ -113 +112 @@
       var clone = cloner.GetClone(this);
       if (clone == null) {
-        clone = (IDeepCloneable)this.Clone();
+        clone = new OnlineCovarianceCalculator(this);
         cloner.RegisterClonedObject(this, clone);
       }

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

@@ -41 +41 @@
     }
 
-    // private constructor used internally by the Clone() method
-    private OnlineDirectionalSymmetryCalculator(OnlineDirectionalSymmetryCalculator other) {
+    protected OnlineDirectionalSymmetryCalculator(OnlineDirectionalSymmetryCalculator other, Cloner cloner = null) {
       n = other.n;
       nCorrect = other.nCorrect;
@@ -132 +131 @@
       var clone = cloner.GetClone(this);
       if (clone == null) {
-        clone = (IDeepCloneable)this.Clone();
+        clone = new OnlineDirectionalSymmetryCalculator(this);
         cloner.RegisterClonedObject(this, clone);
       }

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

@@ -66 +66 @@
     }
 
-    // private constructor used internally by the Clone() method
-    private OnlineLinearScalingParameterCalculator(OnlineMeanAndVarianceCalculator targetMeanCalculator, OnlineMeanAndVarianceCalculator originalMeanAndVarianceCalculator, OnlineCovarianceCalculator originalTargetCovarianceCalculator) {
-      this.targetMeanCalculator = targetMeanCalculator;
-      this.originalMeanAndVarianceCalculator = originalMeanAndVarianceCalculator;
-      this.originalTargetCovarianceCalculator = originalTargetCovarianceCalculator;
+    protected OnlineLinearScalingParameterCalculator(OnlineLinearScalingParameterCalculator other, Cloner cloner) {
+      targetMeanCalculator = (OnlineMeanAndVarianceCalculator)other.targetMeanCalculator.Clone(cloner);
+      originalMeanAndVarianceCalculator = (OnlineMeanAndVarianceCalculator)other.originalMeanAndVarianceCalculator.Clone(cloner);
+      originalTargetCovarianceCalculator = (OnlineCovarianceCalculator)other.originalTargetCovarianceCalculator.Clone(cloner);
       // do not reset the calculators here
     }
@@ -129 +128 @@
     // IDeepCloneable interface members
     public object Clone() {
-      var targetMeanCalculatorClone = (OnlineMeanAndVarianceCalculator)targetMeanCalculator.Clone();
-      var originalMeanAndVarianceCalculatorClone = (OnlineMeanAndVarianceCalculator)originalMeanAndVarianceCalculator.Clone();
-      var originalTargetCovarianceCalculatorClone = (OnlineCovarianceCalculator)originalTargetCovarianceCalculator.Clone();
-      return new OnlineLinearScalingParameterCalculator(targetMeanCalculatorClone, originalMeanAndVarianceCalculatorClone, originalTargetCovarianceCalculatorClone);
+      var cloner = new Cloner();
+      return new OnlineLinearScalingParameterCalculator(this, cloner);
     }
 
@@ -138 +135 @@
       var clone = cloner.GetClone(this);
       if (clone == null) {
-        var targetMeanCalculatorClone = (OnlineMeanAndVarianceCalculator)targetMeanCalculator.Clone(cloner);
-        var originalMeanAndVarianceCalculatorClone = (OnlineMeanAndVarianceCalculator)originalMeanAndVarianceCalculator.Clone(cloner);
-        var originalTargetCovarianceCalculatorClone = (OnlineCovarianceCalculator)originalTargetCovarianceCalculator.Clone(cloner);
-        clone = new OnlineLinearScalingParameterCalculator(targetMeanCalculatorClone, originalMeanAndVarianceCalculatorClone, originalTargetCovarianceCalculatorClone);
+        clone = new OnlineLinearScalingParameterCalculator(this, cloner);
         cloner.RegisterClonedObject(this, clone);
       }

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

@@ -39 +39 @@
     }
 
-    // private constructor used internally by the Clone() method
-    private OnlineMaxAbsoluteErrorCalculator(OnlineMaxAbsoluteErrorCalculator other) {
+    protected OnlineMaxAbsoluteErrorCalculator(OnlineMaxAbsoluteErrorCalculator other, Cloner cloner = null) {
       mae = other.mae;
       n = other.n;
@@ -105 +104 @@
       var clone = cloner.GetClone(this);
       if (clone == null) {
-        clone = (IDeepCloneable)this.Clone();
+        clone = new OnlineMaxAbsoluteErrorCalculator(this);
         cloner.RegisterClonedObject(this, clone);
       }

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

@@ -39 +39 @@
     }
 
-    private OnlineMeanAbsoluteErrorCalculator(OnlineMeanAbsoluteErrorCalculator other) {
+    protected OnlineMeanAbsoluteErrorCalculator(OnlineMeanAbsoluteErrorCalculator other, Cloner cloner = null) {
       sae = other.sae;
       n = other.n;
@@ -103 +103 @@
       var clone = cloner.GetClone(this);
       if (clone == null) {
-        clone = (IDeepCloneable)this.Clone();
+        clone = new OnlineMeanAbsoluteErrorCalculator(this);
         cloner.RegisterClonedObject(this, clone);
       }

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

@@ -39 +39 @@
     }
 
-    // private constructor used internally by the Clone() method
-    private OnlineMeanAbsolutePercentageErrorCalculator(OnlineMeanAbsolutePercentageErrorCalculator other) {
+    protected OnlineMeanAbsolutePercentageErrorCalculator(OnlineMeanAbsolutePercentageErrorCalculator other, Cloner cloner = null) {
       sre = other.sre;
       n = other.n;
@@ -105 +104 @@
       var clone = cloner.GetClone(this);
       if (clone == null) {
-        clone = (IDeepCloneable)this.Clone();
+        clone = new OnlineMeanAbsolutePercentageErrorCalculator(this);
         cloner.RegisterClonedObject(this, clone);
       }

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

@@ -67 +67 @@
     }
 
-    private OnlineMeanAndVarianceCalculator(OnlineMeanAndVarianceCalculator other) : this() {
+    protected OnlineMeanAndVarianceCalculator(OnlineMeanAndVarianceCalculator other, Cloner cloner = null) {
       m_oldS = other.m_oldS;
       m_oldM = other.m_oldM;
@@ -126 +126 @@
       var clone = cloner.GetClone(this);
       if (clone == null) {
-        clone = (IDeepCloneable)this.Clone();
+        clone = new OnlineMeanAndVarianceCalculator(this);
         cloner.RegisterClonedObject(this, clone);
       }

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

@@ -37 +37 @@
     }
 
-    private OnlineMeanErrorCalculator(OnlineMeanAndVarianceCalculator meanAndVarianceCalculator) {
-      this.meanAndVarianceCalculator = meanAndVarianceCalculator;
+    protected OnlineMeanErrorCalculator(OnlineMeanErrorCalculator other, Cloner cloner) {
+      meanAndVarianceCalculator = (OnlineMeanAndVarianceCalculator)other.meanAndVarianceCalculator.Clone(cloner);
     }
 
@@ -82 +82 @@
     // IDeepCloneable members
     public object Clone() {
-      var meanAndVarianceCalculatorClone = (OnlineMeanAndVarianceCalculator)meanAndVarianceCalculator.Clone();
-      return new OnlineMeanErrorCalculator(meanAndVarianceCalculatorClone);
+      var cloner = new Cloner();
+      return new OnlineMeanErrorCalculator(this, cloner);
     }
 
@@ -89 +89 @@
       var clone = cloner.GetClone(this);
       if (clone == null) {
-        var meanAndVarianceCalculatorClone = (OnlineMeanAndVarianceCalculator)meanAndVarianceCalculator.Clone(cloner);
-        clone = new OnlineMeanErrorCalculator(meanAndVarianceCalculatorClone);
+        clone = new OnlineMeanErrorCalculator(this, cloner);
         cloner.RegisterClonedObject(this, clone);
       }

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

@@ -39 +39 @@
     }
 
-    // private constructor used internally by the Clone() method
-    private OnlineMeanSquaredErrorCalculator(OnlineMeanSquaredErrorCalculator other) {
+    protected OnlineMeanSquaredErrorCalculator(OnlineMeanSquaredErrorCalculator other, Cloner cloner = null) {
       sse = other.sse;
       n = other.n;
@@ -104 +103 @@
       var clone = cloner.GetClone(this);
       if (clone == null) {
-        clone = (IDeepCloneable)this.Clone();
+        clone = new OnlineMeanSquaredErrorCalculator(this);
         cloner.RegisterClonedObject(this, clone);
       }

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

@@ -43 +43 @@
     }
 
-    // private constructor used internally by the Clone() method
-    public OnlineNormalizedMeanSquaredErrorCalculator(OnlineMeanAndVarianceCalculator meanSquaredErrorCalculator, OnlineMeanAndVarianceCalculator originalVarianceCalculator) {
-      this.meanSquaredErrorCalculator = meanSquaredErrorCalculator;
-      this.originalVarianceCalculator = originalVarianceCalculator;
+    protected OnlineNormalizedMeanSquaredErrorCalculator(OnlineNormalizedMeanSquaredErrorCalculator other, Cloner cloner) {
+      meanSquaredErrorCalculator = (OnlineMeanAndVarianceCalculator)other.meanSquaredErrorCalculator.Clone(cloner);
+      originalVarianceCalculator = (OnlineMeanAndVarianceCalculator)originalVarianceCalculator.Clone(cloner);
     }
 
@@ -102 +101 @@
     // IDeepCloneable members
     public object Clone() {
-      var meanSquaredErrorCalculatorClone = (OnlineMeanAndVarianceCalculator)meanSquaredErrorCalculator.Clone();
-      var originalVarianceCalculatorClone = (OnlineMeanAndVarianceCalculator)originalVarianceCalculator.Clone();
-      return new OnlineNormalizedMeanSquaredErrorCalculator(meanSquaredErrorCalculatorClone, originalVarianceCalculatorClone);
+      var cloner = new Cloner();
+      return new OnlineNormalizedMeanSquaredErrorCalculator(this, cloner);
     }
 
@@ -110 +108 @@
       var clone = cloner.GetClone(this);
       if (clone == null) {
-        var meanSquaredErrorCalculatorClone = (OnlineMeanAndVarianceCalculator)meanSquaredErrorCalculator.Clone(cloner);
-        var originalVarianceCalculatorClone = (OnlineMeanAndVarianceCalculator)originalVarianceCalculator.Clone(cloner);
-        clone = new OnlineNormalizedMeanSquaredErrorCalculator(meanSquaredErrorCalculatorClone, originalVarianceCalculatorClone);
+        clone = new OnlineNormalizedMeanSquaredErrorCalculator(this, cloner);
         cloner.RegisterClonedObject(this, clone);
       }

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);
       }

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

@@ -38 +38 @@
     public OnlinePearsonsRSquaredCalculator() { }
 
-    private OnlinePearsonsRSquaredCalculator(OnlinePearsonsRCalculator rCalculator) {
-      this.rCalculator = rCalculator;
+    protected OnlinePearsonsRSquaredCalculator(OnlinePearsonsRSquaredCalculator other, Cloner cloner) {
+      this.rCalculator = (OnlinePearsonsRCalculator)other.rCalculator.Clone(cloner);
     }
 
@@ -66 +66 @@
     // IDeepCloneable members
     public object Clone() {
-      var rCalculatorClone = (OnlinePearsonsRCalculator)rCalculator.Clone();
-      return new OnlinePearsonsRSquaredCalculator(rCalculatorClone);
+      var cloner = new Cloner();
+      return new OnlinePearsonsRSquaredCalculator(this, cloner);
     }
 
@@ -73 +73 @@
       var clone = cloner.GetClone(this);
       if (clone == null) {
-        var rCalculatorClone = (OnlinePearsonsRCalculator)rCalculator.Clone(cloner);
-        clone = new OnlinePearsonsRSquaredCalculator(rCalculatorClone);
+        clone = new OnlinePearsonsRSquaredCalculator(this, cloner);
         cloner.RegisterClonedObject(this, clone);
       }

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

@@ -46 +46 @@
     }
 
-    // private constructor used internally by the Clone() method
-    private OnlineTheilsUStatisticCalculator(OnlineMeanAndVarianceCalculator squaredErrorMeanCalculator, OnlineMeanAndVarianceCalculator unbiasedEstimatorMeanCalculator) {
-      this.squaredErrorMeanCalculator = squaredErrorMeanCalculator;
-      this.unbiasedEstimatorMeanCalculator = unbiasedEstimatorMeanCalculator;
+    protected OnlineTheilsUStatisticCalculator(OnlineTheilsUStatisticCalculator other, Cloner cloner) {
+      squaredErrorMeanCalculator = (OnlineMeanAndVarianceCalculator)other.squaredErrorMeanCalculator.Clone(cloner);
+      unbiasedEstimatorMeanCalculator = (OnlineMeanAndVarianceCalculator)other.unbiasedEstimatorMeanCalculator.Clone(cloner);
     }
 
@@ -135 +134 @@
     // IDeepCloneable members
     public object Clone() {
-      var squaredErrorMeanCalculatorClone = (OnlineMeanAndVarianceCalculator)squaredErrorMeanCalculator.Clone();
-      var unbiasedEstimatorMeanCalculatorClone = (OnlineMeanAndVarianceCalculator)unbiasedEstimatorMeanCalculator.Clone();
-      return new OnlineTheilsUStatisticCalculator(squaredErrorMeanCalculatorClone, unbiasedEstimatorMeanCalculatorClone);
+      var cloner = new Cloner();
+      return new OnlineTheilsUStatisticCalculator(this, cloner);
     }
 
@@ -143 +141 @@
       var clone = cloner.GetClone(this);
       if (clone == null) {
-        var squaredErrorMeanCalculatorClone = (OnlineMeanAndVarianceCalculator)squaredErrorMeanCalculator.Clone(cloner);
-        var unbiasedEstimatorMeanCalculatorClone = (OnlineMeanAndVarianceCalculator)unbiasedEstimatorMeanCalculator.Clone(cloner);
-        clone = new OnlineTheilsUStatisticCalculator(squaredErrorMeanCalculatorClone, unbiasedEstimatorMeanCalculatorClone);
+        clone = new OnlineTheilsUStatisticCalculator(this, cloner);
         cloner.RegisterClonedObject(this, clone);
       }

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

@@ -42 +42 @@
     }
 
-    // private constructor used internally by the Clone() method
-    private OnlineWeightedDirectionalSymmetryCalculator(OnlineWeightedDirectionalSymmetryCalculator other) {
+    protected OnlineWeightedDirectionalSymmetryCalculator(OnlineWeightedDirectionalSymmetryCalculator other, Cloner cloner = null) {
       n = other.n;
       correctSum = other.correctSum;
@@ -135 +134 @@
       var clone = cloner.GetClone(this);
       if (clone == null) {
-        clone = (IDeepCloneable)this.Clone();
+        clone = new OnlineWeightedDirectionalSymmetryCalculator(this);
         cloner.RegisterClonedObject(this, clone);
       }