Changeset 4722 for trunk/sources/HeuristicLab.Problems.DataAnalysis.Classification/3.3/Symbolic/SymbolicClassificationProblem.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.Problems.DataAnalysis.Classification/3.3/Symbolic/SymbolicClassificationProblem.cs (modified) (13 diffs)

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());