Changeset 4722 for trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.3/CrossValidation.cs

Timestamp:

11/06/10 01:56:04 (14 years ago)

Author:

swagner

Message:

Merged cloning refactoring branch back into trunk (#922)

Location:

trunk/sources

Files:

• . (modified) (1 prop)
• HeuristicLab.Algorithms.DataAnalysis/3.3/CrossValidation.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.3/CrossValidation.cs

@@ -72 +72 @@
     }
 
+    private CrossValidation(CrossValidation original, Cloner cloner)
+      : base(original, cloner) {
+      executionState = original.executionState;
+      storeAlgorithmInEachRun = original.storeAlgorithmInEachRun;
+      runs = cloner.Clone(original.runs);
+      runsCounter = original.runsCounter;
+      algorithm = cloner.Clone(original.algorithm);
+      clonedAlgorithms = cloner.Clone(original.clonedAlgorithms);
+      folds = cloner.Clone(original.folds);
+      numberOfWorkers = cloner.Clone(original.numberOfWorkers);
+      samplesStart = cloner.Clone(original.samplesStart);
+      samplesEnd = cloner.Clone(original.samplesEnd);
+      RegisterEvents();
+    }
     public override IDeepCloneable Clone(Cloner cloner) {
-      CrossValidation clone = (CrossValidation)base.Clone(cloner);
-      clone.executionState = executionState;
-      clone.storeAlgorithmInEachRun = storeAlgorithmInEachRun;
-      clone.runs = (RunCollection)cloner.Clone(runs);
-      clone.runsCounter = runsCounter;
-      clone.algorithm = (IAlgorithm)cloner.Clone(algorithm);
-      clone.clonedAlgorithms = (ItemCollection<IAlgorithm>)cloner.Clone(clonedAlgorithms);
-      clone.folds = (IntValue)cloner.Clone(folds);
-      clone.numberOfWorkers = (IntValue)cloner.Clone(numberOfWorkers);
-      clone.samplesStart = (IntValue)cloner.Clone(samplesStart);
-      clone.samplesEnd = (IntValue)cloner.Clone(samplesEnd);
-      clone.RegisterEvents();
-      return clone;
-    }
+      return new CrossValidation(this, cloner);
+    }
+
     #endregion