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

Timestamp:

11/06/10 01:56:04 (13 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/LinearRegression.cs (modified) (2 diffs)

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

@@ -99 +99 @@
     [StorableConstructor]
     private LinearRegression(bool deserializing) : base(deserializing) { }
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() {
+      Initialize();
+    }
 
+    private LinearRegression(LinearRegression original, Cloner cloner)
+      : base(original, cloner) {
+      solutionCreator = cloner.Clone(original.solutionCreator);
+      evaluator = cloner.Clone(original.evaluator);
+      mseEvaluator = cloner.Clone(original.mseEvaluator);
+      analyzer = cloner.Clone(original.analyzer);
+      Initialize();
+    }
     public override IDeepCloneable Clone(Cloner cloner) {
-      LinearRegression clone = (LinearRegression)base.Clone(cloner);
-      clone.solutionCreator = (LinearRegressionSolutionCreator)cloner.Clone(solutionCreator);
-      clone.evaluator = (SimpleSymbolicRegressionEvaluator)cloner.Clone(evaluator);
-      clone.mseEvaluator = (SimpleMSEEvaluator)cloner.Clone(mseEvaluator);
-      clone.analyzer = (BestSymbolicRegressionSolutionAnalyzer)cloner.Clone(analyzer);
-      clone.Initialize();
-      return clone;
+      return new LinearRegression(this, cloner);
     }
 
@@ -133 +139 @@
 
     #region Helpers
-    [StorableHook(HookType.AfterDeserialization)]
     private void Initialize() {
       solutionCreator.SamplesStartParameter.ActualName = TrainingSamplesStartParameter.Name;