Changeset 14372 for trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/OnlineCalculators

Timestamp:

11/04/16 18:04:16 (8 years ago)

Author:

mkommend

Message:

#2672: Adapted OnlineAccuracyCalculator to use correct deep cloning pattern.

File:

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

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

@@ -25 +25 @@
 
 namespace HeuristicLab.Problems.DataAnalysis {
-  public class OnlineAccuracyCalculator : IOnlineCalculator, IDeepCloneable {
+  public class OnlineAccuracyCalculator : DeepCloneable, IOnlineCalculator {
 
     private int correctlyClassified;
@@ -39 +39 @@
     }
 
-    // private constructor used internally by the Clone() method
-    protected OnlineAccuracyCalculator(OnlineAccuracyCalculator other, Cloner cloner = null) {
-      correctlyClassified = other.correctlyClassified;
-      n = other.n;
-      errorState = other.errorState;
+    protected OnlineAccuracyCalculator(OnlineAccuracyCalculator original, Cloner cloner)
+      : base(original, cloner) {
+      correctlyClassified = original.correctlyClassified;
+      n = original.n;
+      errorState = original.errorState;
     }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new OnlineAccuracyCalculator(this, cloner);
+    }
+
 
     #region IOnlineCalculator Members
@@ -98 +103 @@
     }
 
-    // IDeepCloneable interface members
-    public object Clone() {
-      return new OnlineAccuracyCalculator(this);
-    }
-
-    public IDeepCloneable Clone(Cloner cloner) {
-      var clone = cloner.GetClone(this);
-      if (clone == null) {
-        clone = new OnlineAccuracyCalculator(this);
-        cloner.RegisterClonedObject(this, clone);
-      }
-      return clone;
-    }
   }
 }