Changeset 4722 for trunk/sources/HeuristicLab.Problems.DataAnalysis.Classification/3.3/Symbolic

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.Problems.DataAnalysis.Classification/3.3/Symbolic/Analyzer/ValidationBestSymbolicClassificationSolutionAnalyzer.cs (modified) (4 diffs)
• HeuristicLab.Problems.DataAnalysis.Classification/3.3/Symbolic/Evaluators/SymbolicClassificationMeanSquaredErrorEvaluator.cs (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis.Classification/3.3/Symbolic/Evaluators/SymbolicClassificationPearsonRSquaredEvaluator.cs (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis.Classification/3.3/Symbolic/SymbolicClassificationProblem.cs (modified) (13 diffs)
• HeuristicLab.Problems.DataAnalysis.Classification/3.3/Symbolic/SymbolicClassificationSolution.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Classification/3.3/Symbolic/Analyzer/ValidationBestSymbolicClassificationSolutionAnalyzer.cs

@@ -23 +23 @@
 using System.Linq;
 using HeuristicLab.Analysis;
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
@@ -180 +181 @@
     #endregion
 
+    [StorableConstructor]
+    protected ValidationBestSymbolicClassificationSolutionAnalyzer(bool deserializing) : base(deserializing) { }
+    protected ValidationBestSymbolicClassificationSolutionAnalyzer(ValidationBestSymbolicClassificationSolutionAnalyzer original, Cloner cloner)
+      : base(original, cloner) {
+    }
     public ValidationBestSymbolicClassificationSolutionAnalyzer()
       : base() {
@@ -204 +210 @@
     }
 
-    [StorableConstructor]
-    private ValidationBestSymbolicClassificationSolutionAnalyzer(bool deserializing) : base(deserializing) { }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new ValidationBestSymbolicClassificationSolutionAnalyzer(this, cloner);
+    }
 
     public override IOperation Apply() {
@@ -304 +311 @@
       }
     }
-
   }
 }

trunk/sources/HeuristicLab.Problems.DataAnalysis.Classification/3.3/Symbolic/Evaluators/SymbolicClassificationMeanSquaredErrorEvaluator.cs

@@ -20 +20 @@
 #endregion
 
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -27 +28 @@
   [Item("SymbolicClassificationMeanSquaredErrorEvaluator", "Calculates the mean squared error of a symbolic classification solution.")]
   [StorableClass]
-  public class SymbolicClassifacitionMeanSquaredErrorEvaluator : SymbolicRegressionMeanSquaredErrorEvaluator, ISymbolicClassificationEvaluator {
+  public sealed class SymbolicClassifacitionMeanSquaredErrorEvaluator : SymbolicRegressionMeanSquaredErrorEvaluator, ISymbolicClassificationEvaluator {
     public ClassificationProblemData ClassificationProblemData {
       get { return (ClassificationProblemData)RegressionProblemData; }
     }
 
-    public SymbolicClassifacitionMeanSquaredErrorEvaluator()
-      : base() {
+    [StorableConstructor]
+    private SymbolicClassifacitionMeanSquaredErrorEvaluator(bool deserializing) : base(deserializing) { }
+    private SymbolicClassifacitionMeanSquaredErrorEvaluator(SymbolicClassifacitionMeanSquaredErrorEvaluator original, Cloner cloner) : base(original, cloner) { }
+    public SymbolicClassifacitionMeanSquaredErrorEvaluator() : base() { }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new SymbolicClassifacitionMeanSquaredErrorEvaluator(this, cloner);
     }
   }

trunk/sources/HeuristicLab.Problems.DataAnalysis.Classification/3.3/Symbolic/Evaluators/SymbolicClassificationPearsonRSquaredEvaluator.cs

@@ -20 +20 @@
 #endregion
 
+using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -27 +28 @@
   [Item("SymbolicClassificationPearsonRSquaredEvaluator", "Calculates the pearson R² correlation coefficient of a symbolic classification solution.")]
   [StorableClass]
-  public class SymbolicClassificationPearsonRSquaredEvaluator : SymbolicRegressionPearsonsRSquaredEvaluator, ISymbolicClassificationEvaluator {
+  public sealed class SymbolicClassificationPearsonRSquaredEvaluator : SymbolicRegressionPearsonsRSquaredEvaluator, ISymbolicClassificationEvaluator {
     public ClassificationProblemData ClassificationProblemData {
       get { return (ClassificationProblemData)RegressionProblemData; }
     }
 
-    public SymbolicClassificationPearsonRSquaredEvaluator()
-      : base() {
+    [StorableConstructor]
+    private SymbolicClassificationPearsonRSquaredEvaluator(bool deserializing) : base(deserializing) { }
+    private SymbolicClassificationPearsonRSquaredEvaluator(SymbolicClassificationPearsonRSquaredEvaluator original, Cloner cloner) : base(original, cloner) { }
+    public SymbolicClassificationPearsonRSquaredEvaluator() : base() { }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new SymbolicClassificationPearsonRSquaredEvaluator(this, cloner);
     }
   }

trunk/sources/HeuristicLab.Problems.DataAnalysis.Classification/3.3/Symbolic/SymbolicClassificationProblem.cs

@@ -42 +42 @@
   [StorableClass]
   [Creatable("Problems")]
-  public class SymbolicClassificationProblem : SingleObjectiveClassificationProblem<ISymbolicClassificationEvaluator, ISymbolicExpressionTreeCreator>, IStorableContent {
+  public sealed class SymbolicClassificationProblem : SingleObjectiveClassificationProblem<ISymbolicClassificationEvaluator, ISymbolicExpressionTreeCreator>, IStorableContent {
     private const string SymbolicExpressionTreeInterpreterParameterName = "SymbolicExpressionTreeInterpreter";
     private const string FunctionTreeGrammarParameterName = "FunctionTreeGrammar";
@@ -57 +57 @@
     public ISymbolicExpressionTreeInterpreter SymbolicExpressionTreeInterpreter {
       get { return SymbolicExpressionTreeInterpreterParameter.Value; }
-      protected set { SymbolicExpressionTreeInterpreterParameter.Value = value; }
+      private set { SymbolicExpressionTreeInterpreterParameter.Value = value; }
     }
     public IValueParameter<ISymbolicExpressionTreeInterpreter> SymbolicExpressionTreeInterpreterParameter {
@@ -65 +65 @@
     public ISymbolicExpressionGrammar FunctionTreeGrammar {
       get { return (ISymbolicExpressionGrammar)FunctionTreeGrammarParameter.Value; }
-      protected set { FunctionTreeGrammarParameter.Value = value; }
+      private set { FunctionTreeGrammarParameter.Value = value; }
     }
     public IValueParameter<ISymbolicExpressionGrammar> FunctionTreeGrammarParameter {
@@ -73 +73 @@
     public IntValue MaxExpressionLength {
       get { return MaxExpressionLengthParameter.Value; }
-      protected set { MaxExpressionLengthParameter.Value = value; }
+      private set { MaxExpressionLengthParameter.Value = value; }
     }
     public IValueParameter<IntValue> MaxExpressionLengthParameter {
@@ -81 +81 @@
     public IntValue MaxExpressionDepth {
       get { return MaxExpressionDepthParameter.Value; }
-      protected set { MaxExpressionDepthParameter.Value = value; }
+      private set { MaxExpressionDepthParameter.Value = value; }
     }
     public ValueParameter<IntValue> MaxExpressionDepthParameter {
@@ -89 +89 @@
     public DoubleValue UpperEstimationLimit {
       get { return UpperEstimationLimitParameter.Value; }
-      protected set { UpperEstimationLimitParameter.Value = value; }
+      private set { UpperEstimationLimitParameter.Value = value; }
     }
     public IValueParameter<DoubleValue> UpperEstimationLimitParameter {
@@ -97 +97 @@
     public DoubleValue LowerEstimationLimit {
       get { return LowerEstimationLimitParameter.Value; }
-      protected set { LowerEstimationLimitParameter.Value = value; }
+      private set { LowerEstimationLimitParameter.Value = value; }
     }
     public IValueParameter<DoubleValue> LowerEstimationLimitParameter {
@@ -105 +105 @@
     public IntValue MaxFunctionDefiningBranches {
       get { return MaxFunctionDefiningBranchesParameter.Value; }
-      protected set { MaxFunctionDefiningBranchesParameter.Value = value; }
+      private set { MaxFunctionDefiningBranchesParameter.Value = value; }
     }
     public IValueParameter<IntValue> MaxFunctionDefiningBranchesParameter {
@@ -113 +113 @@
     public IntValue MaxFunctionArguments {
       get { return MaxFunctionArgumentsParameter.Value; }
-      protected set { MaxFunctionArgumentsParameter.Value = value; }
+      private set { MaxFunctionArgumentsParameter.Value = value; }
     }
     public IValueParameter<IntValue> MaxFunctionArgumentsParameter {
@@ -133 +133 @@
 
     [StorableConstructor]
-    protected SymbolicClassificationProblem(bool deserializing) : base(deserializing) { }
+    private SymbolicClassificationProblem(bool deserializing) : base(deserializing) { }
+    private SymbolicClassificationProblem(SymbolicClassificationProblem original, Cloner cloner)
+      : base(original, cloner) {
+      RegisterParameterEvents();
+
+      UpdateEstimationLimits();
+      ParameterizeEvaluator();
+      ParameterizeSolutionCreator();
+      ParameterizeGrammar();
+      ParameterizeOperators();
+      ParameterizeAnalyzers();
+    }
     public SymbolicClassificationProblem()
       : base() {
@@ -167 +178 @@
     }
 
-
-    [StorableHook(HookType.AfterDeserialization)]
-    private void AfterDeserialization() {
-
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new SymbolicClassificationProblem(this, cloner);
     }
 
@@ -213 +222 @@
       OnGrammarChanged();
     }
-    protected virtual void OnGrammarChanged() {
+    private void OnGrammarChanged() {
       ParameterizeGrammar();
     }
@@ -225 +234 @@
       OnArchitectureParameterChanged();
     }
-    protected virtual void OnArchitectureParameterChanged() {
-      ParameterizeGrammar();
-    }
-
-    protected virtual void InitializeOperators() {
+    private void OnArchitectureParameterChanged() {
+      ParameterizeGrammar();
+    }
+
+    private void InitializeOperators() {
       Operators.AddRange(ApplicationManager.Manager.GetInstances<ISymbolicExpressionTreeOperator>().OfType<IOperator>());
       Operators.Add(new MinAverageMaxSymbolicExpressionTreeSizeAnalyzer());

trunk/sources/HeuristicLab.Problems.DataAnalysis.Classification/3.3/Symbolic/SymbolicClassificationSolution.cs

@@ -35 +35 @@
   [StorableClass]
   public class SymbolicClassificationSolution : SymbolicRegressionSolution, IClassificationSolution {
-    private SymbolicClassificationSolution() : base() { }
+    public new ClassificationProblemData ProblemData {
+      get { return (ClassificationProblemData)base.ProblemData; }
+      set { base.ProblemData = value; }
+    }
+
+    #region properties
+    private List<double> optimalThresholds;
+    private List<double> actualThresholds;
+    public IEnumerable<double> Thresholds {
+      get {
+        if (actualThresholds == null) RecalculateEstimatedValues();
+        return actualThresholds;
+      }
+      set {
+        if (actualThresholds != null && actualThresholds.SequenceEqual(value))
+          return;
+        actualThresholds = new List<double>(value);
+        OnThresholdsChanged();
+      }
+    }
+
+    public IEnumerable<double> EstimatedClassValues {
+      get { return GetEstimatedClassValues(Enumerable.Range(0, ProblemData.Dataset.Rows)); }
+    }
+
+    public IEnumerable<double> EstimatedTrainingClassValues {
+      get { return GetEstimatedClassValues(ProblemData.TrainingIndizes); }
+    }
+
+    public IEnumerable<double> EstimatedTestClassValues {
+      get { return GetEstimatedClassValues(ProblemData.TestIndizes); }
+    }
+
+    [StorableConstructor]
+    protected SymbolicClassificationSolution(bool deserializing) : base(deserializing) { }
+    protected SymbolicClassificationSolution(SymbolicClassificationSolution original, Cloner cloner) : base(original, cloner) { }
     public SymbolicClassificationSolution(ClassificationProblemData problemData, SymbolicRegressionModel model, double lowerEstimationLimit, double upperEstimationLimit)
       : base(problemData, model, lowerEstimationLimit, upperEstimationLimit) {
     }
 
-    public new ClassificationProblemData ProblemData {
-      get { return (ClassificationProblemData)base.ProblemData; }
-      set { base.ProblemData = value; }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new SymbolicClassificationSolution(this, cloner);
     }
 
@@ -114 +148 @@
     }
 
-    #region properties
-    private List<double> optimalThresholds;
-    private List<double> actualThresholds;
-    public IEnumerable<double> Thresholds {
-      get {
-        if (actualThresholds == null) RecalculateEstimatedValues();
-        return actualThresholds;
-      }
-      set {
-        if (actualThresholds != null && actualThresholds.SequenceEqual(value))
-          return;
-        actualThresholds = new List<double>(value);
-        OnThresholdsChanged();
-      }
-    }
-
-    public IEnumerable<double> EstimatedClassValues {
-      get { return GetEstimatedClassValues(Enumerable.Range(0, ProblemData.Dataset.Rows)); }
-    }
-
-    public IEnumerable<double> EstimatedTrainingClassValues {
-      get { return GetEstimatedClassValues(ProblemData.TrainingIndizes); }
-    }
-
-    public IEnumerable<double> EstimatedTestClassValues {
-      get { return GetEstimatedClassValues(ProblemData.TestIndizes); }
-    }
-
     public IEnumerable<double> GetEstimatedClassValues(IEnumerable<int> rows) {
       double[] classValues = ProblemData.SortedClassValues.ToArray();