Changeset 16565 for trunk/HeuristicLab.DataPreprocessing/3.4/Filter

Timestamp:

01/28/19 13:41:42 (6 years ago)

Author:

gkronber

Message:

#2520: merged changes from PersistenceOverhaul branch (r16451:16564) into trunk

Location:

trunk

Files:

• . (modified) (1 prop)
• HeuristicLab.DataPreprocessing (modified) (1 prop)
• HeuristicLab.DataPreprocessing/3.4 (modified) (1 prop)
• HeuristicLab.DataPreprocessing/3.4/Filter/ComparisonFilter.cs (modified) (4 diffs)
• HeuristicLab.DataPreprocessing/3.4/Filter/IFilter.cs (modified) (2 diffs)

trunk/HeuristicLab.DataPreprocessing/3.4/Filter/ComparisonFilter.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -22 +22 @@
 using System;
 using System.Drawing;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Common.Resources;
@@ -29 +30 @@
 namespace HeuristicLab.DataPreprocessing.Filter {
   [Item("ComparisonFilter", "A filter which compares the member of the preprocessing data with the constraint data.")]
+  [StorableType("6529899a-987c-48b3-ba14-154d25a7cc8e")]
   public class ComparisonFilter : ComparisonConstraint, IFilter {
     public override string ItemName {
@@ -53 +55 @@
 
     public ComparisonFilter() : base() { }
-    protected ComparisonFilter(bool deserializing) : base(deserializing) { }
+    [StorableConstructor]
+    protected ComparisonFilter(StorableConstructorFlag _) : base(_) { }
 
     public ComparisonFilter(IPreprocessingData constrainedValue, ConstraintOperation constraintOperation, object constraintData)

trunk/HeuristicLab.DataPreprocessing/3.4/Filter/IFilter.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -21 +21 @@
 
 using HeuristicLab.Core;
+using HEAL.Attic;
 
 namespace HeuristicLab.DataPreprocessing.Filter {
+  [StorableType("bf5dabf7-e795-493c-b2d0-23051dfb3d2f")]
   public interface IFilter : IConstraint {
     new bool[] Check();