Changeset 4722 for trunk/sources/HeuristicLab.Algorithms.DataAnalysis

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)
• HeuristicLab.Algorithms.DataAnalysis/3.3/LinearRegression.cs (modified) (2 diffs)
• HeuristicLab.Algorithms.DataAnalysis/3.3/SupportVectorMachine.cs (modified) (2 diffs)

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
 

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;

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

@@ -145 +145 @@
     [StorableConstructor]
     private SupportVectorMachine(bool deserializing) : base(deserializing) { }
-
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() {
+      Initialize();
+    }
+
+    private SupportVectorMachine(SupportVectorMachine 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) {
-      SupportVectorMachine clone = (SupportVectorMachine)base.Clone(cloner);
-      clone.solutionCreator = (SupportVectorMachineModelCreator)cloner.Clone(solutionCreator);
-      clone.evaluator = (SupportVectorMachineModelEvaluator)cloner.Clone(evaluator);
-      clone.mseEvaluator = (SimpleMSEEvaluator)cloner.Clone(mseEvaluator);
-      clone.analyzer = (BestSupportVectorRegressionSolutionAnalyzer)cloner.Clone(analyzer);
-      clone.Initialize();
-      return clone;
+      return new SupportVectorMachine(this, cloner);
     }
 
@@ -178 +184 @@
 
     #region Helpers
-    [StorableHook(HookType.AfterDeserialization)]
     private void Initialize() {
       solutionCreator.SvmTypeParameter.ActualName = SvmTypeParameter.Name;