Changeset 10402 for branches/Sliding Window GP/HeuristicLab.Problems.DataAnalysis.Symbolic

Timestamp:

01/27/14 14:14:42 (11 years ago)

Author:

bburlacu

Message:

#1837: Added missing license information headers. Added storable constructors and changed properties in SlidingWindowBestSolutionsCollection to return IEnumerables instead of Lists.

File:

• branches/Sliding Window GP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SlidingWindow/SlidingWindowBestSolutionsCollection.cs (modified) (2 diffs)

branches/Sliding Window GP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SlidingWindow/SlidingWindowBestSolutionsCollection.cs

@@ -31 +31 @@
   [Item("SlidingWindowBestSolutionsCollection", "An object holding a collection of the best sliding window solutions.")]
   public abstract class SlidingWindowBestSolutionsCollection : Item {
+
+    private List<ISymbolicExpressionTree> bestSolutions;
     [Storable]
-    private List<ISymbolicExpressionTree> bestSolutions;
-    public List<ISymbolicExpressionTree> BestSolutions {
+    public IEnumerable<ISymbolicExpressionTree> BestSolutions {
       get { return bestSolutions; }
+      set { bestSolutions = new List<ISymbolicExpressionTree>(value); }
     }
 
+    private List<IntRange> slidingWindowPositions;
     [Storable]
-    private List<IntRange> slidingWindowPositions;
-    public List<IntRange> SlidingWindowPositions {
+    public IEnumerable<IntRange> SlidingWindowPositions {
       get { return slidingWindowPositions; }
+      set { slidingWindowPositions = new List<IntRange>(value); }
     }
 
@@ -56 +59 @@
       set { interpreter = value; }
     }
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() {
+    }
 
+    [StorableConstructor]
+    protected SlidingWindowBestSolutionsCollection(bool deserializing) : base(deserializing) { }
     protected SlidingWindowBestSolutionsCollection(SlidingWindowBestSolutionsCollection original, Cloner cloner)
       : base(original, cloner) {
-      this.bestSolutions = original.BestSolutions;
-      this.slidingWindowPositions = original.SlidingWindowPositions;
-      this.ProblemData = original.ProblemData;
-      this.Interpreter = original.Interpreter;
+      this.bestSolutions = original.bestSolutions;
+      this.slidingWindowPositions = original.slidingWindowPositions;
+      this.problemData = original.problemData;
+      this.interpreter = original.interpreter;
     }
     protected SlidingWindowBestSolutionsCollection() {