Changeset 13269 for trunk/sources/HeuristicLab.Problems.GeneticProgramming/3.3/BasicSymbolicRegression

Timestamp:

11/19/15 09:57:06 (9 years ago)

Author:

mkommend

Message:

#2472: Moved cloning and persistence code near the default ctor for all new GP problems.

File:

• trunk/sources/HeuristicLab.Problems.GeneticProgramming/3.3/BasicSymbolicRegression/Problem.cs (modified) (6 diffs)

trunk/sources/HeuristicLab.Problems.GeneticProgramming/3.3/BasicSymbolicRegression/Problem.cs

@@ -39 +39 @@
 
     #region parameter names
-
     private const string ProblemDataParameterName = "ProblemData";
-
     #endregion
-
-    public event EventHandler ProblemDataChanged;
 
     #region Parameter Properties
@@ -52 +48 @@
       get { return (IValueParameter<IRegressionProblemData>)Parameters[ProblemDataParameterName]; }
     }
-
     #endregion
 
     #region Properties
-
     public IRegressionProblemData ProblemData {
       get { return ProblemDataParameter.Value; }
@@ -62 +56 @@
     }
     IDataAnalysisProblemData IDataAnalysisProblem.ProblemData { get { return ProblemData; } }
+    #endregion
 
-
-    #endregion
+    public event EventHandler ProblemDataChanged;
 
     public override bool Maximization {
       get { return true; }
     }
+
+    #region item cloning and persistence
+    // persistence
+    [StorableConstructor]
+    private Problem(bool deserializing) : base(deserializing) { }
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() {
+      RegisterEventHandlers();
+    }
+
+    // cloning 
+    private Problem(Problem original, Cloner cloner)
+      : base(original, cloner) {
+      RegisterEventHandlers();
+    }
+    public override IDeepCloneable Clone(Cloner cloner) { return new Problem(this, cloner); }
+    #endregion
 
     public Problem()
@@ -102 +113 @@
       return InterpretRec(tree.Root.GetSubtree(0).GetSubtree(0), dataset, rows);
     }
-                                                                                                       
+
     private IEnumerable<double> InterpretRec(ISymbolicExpressionTreeNode node, IDataset dataset, IEnumerable<int> rows) {
       Func<ISymbolicExpressionTreeNode, ISymbolicExpressionTreeNode, Func<double, double, double>, IEnumerable<double>> binaryEval =
-        (left, right, f) => InterpretRec(left, dataset,rows).Zip(InterpretRec(right, dataset, rows), f);
+        (left, right, f) => InterpretRec(left, dataset, rows).Zip(InterpretRec(right, dataset, rows), f);
 
       switch (node.Symbol.Name) {
@@ -124 +135 @@
     }
 
-    #region item cloning and persistence
-    // persistence
-    [StorableConstructor]
-    private Problem(bool deserializing) : base(deserializing) { }
-
-    [StorableHook(HookType.AfterDeserialization)]
-    private void AfterDeserialization() {
-      RegisterEventHandlers();
-    }
-
-    // cloning 
-    private Problem(Problem original, Cloner cloner)
-      : base(original, cloner) {
-      RegisterEventHandlers();
-    }
-    public override IDeepCloneable Clone(Cloner cloner) {
-      return new Problem(this, cloner);
-    }
-    #endregion
 
     #region events
-
     private void RegisterEventHandlers() {
       ProblemDataParameter.ValueChanged += new EventHandler(ProblemDataParameter_ValueChanged);
@@ -188 +179 @@
       Encoding.Grammar = g;
     }
-
     #endregion