Changeset 16565 for trunk/HeuristicLab.Core/3.3/Constraints

Timestamp:

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

Author:

gkronber

Message:

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

Location:

trunk

Files:

• . (modified) (1 prop)
• HeuristicLab.Core (modified) (1 prop)
• HeuristicLab.Core/3.3/Constraints/ComparisonConstraint.cs (modified) (2 diffs)
• HeuristicLab.Core/3.3/Constraints/Constraint.cs (modified) (2 diffs)
• HeuristicLab.Core/3.3/Constraints/ConstraintOperation.cs (modified) (3 diffs)
• HeuristicLab.Core/3.3/Constraints/EqualityConstraint.cs (modified) (2 diffs)
• HeuristicLab.Core/3.3/Constraints/IConstraint.cs (modified) (2 diffs)
• HeuristicLab.Core/3.3/Constraints/TypeCompatibilityConstraint.cs (modified) (2 diffs)

trunk/HeuristicLab.Core/3.3/Constraints/ComparisonConstraint.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.
@@ -23 +23 @@
 using System.Collections.Generic;
 using HeuristicLab.Common;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Core {
-  [StorableClass]
+  [StorableType("6FCBEAF5-62A1-48F9-B1A8-F81D4B15A4AE")]
   [Item("ComparisonConstraint", "A constraint which checks for specified compare operation.")]
   public class ComparisonConstraint : Constraint {
     [StorableConstructor]
-    protected ComparisonConstraint(bool deserializing) : base(deserializing) { }
+    protected ComparisonConstraint(StorableConstructorFlag _) : base(_) { }
     protected ComparisonConstraint(ComparisonConstraint original, Cloner cloner) : base(original, cloner) { }
     public ComparisonConstraint() : base() { }

trunk/HeuristicLab.Core/3.3/Constraints/Constraint.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.
@@ -24 +24 @@
 using System.Linq;
 using HeuristicLab.Common;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Core {
-  [StorableClass]
+  [StorableType("02F8AFE2-BF67-4378-9E38-B18FF4D63609")]
   public abstract class Constraint : Item, IConstraint {
     [StorableConstructor]
-    protected Constraint(bool deserializing) : base(deserializing) { }
+    protected Constraint(StorableConstructorFlag _) : base(_) { }
     protected Constraint(Constraint original, Cloner cloner)
       : base(original, cloner) {

trunk/HeuristicLab.Core/3.3/Constraints/ConstraintOperation.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.
@@ -20 +20 @@
 #endregion
 
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 namespace HeuristicLab.Core {
-  [StorableClass]
+  [StorableType("8518F185-8222-414D-8AAF-0273D7B09A0E")]
   public class ConstraintOperation {
     public static readonly ConstraintOperation Equal = new ConstraintOperation(0, "Equal");
@@ -39 +39 @@
 
     [StorableConstructor]
-    protected ConstraintOperation(bool deserializing) { }
+    protected ConstraintOperation(StorableConstructorFlag _) { }
     protected ConstraintOperation(int value, string name) {
       this.value = value;

trunk/HeuristicLab.Core/3.3/Constraints/EqualityConstraint.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.
@@ -23 +23 @@
 using System.Collections.Generic;
 using HeuristicLab.Common;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Core {
-  [StorableClass]
+  [StorableType("9E83A84E-39A1-4DEB-90EB-DEB5A457D77D")]
   [Item("EqualityConstraint", "A constraint which checks for equality.")]
   public class EqualityConstraint : Constraint {
     [StorableConstructor]
-    protected EqualityConstraint(bool deserializing) : base(deserializing) { }
+    protected EqualityConstraint(StorableConstructorFlag _) : base(_) { }
     protected EqualityConstraint(EqualityConstraint original, Cloner cloner) : base(original, cloner) { }
     public EqualityConstraint() : base() { }

trunk/HeuristicLab.Core/3.3/Constraints/IConstraint.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.Collections.Generic;
+using HEAL.Attic;
 
 namespace HeuristicLab.Core {
+  [StorableType("070af09a-c6b5-4f2b-be2e-4c2c6732febd")]
   public interface IConstraint : IItem {
     bool Active { get; set; }

trunk/HeuristicLab.Core/3.3/Constraints/TypeCompatibilityConstraint.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.
@@ -23 +23 @@
 using System.Collections.Generic;
 using HeuristicLab.Common;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Core {
-  [StorableClass]
+  [StorableType("0BE7E71A-DA13-440F-83C3-0AD15C9E519D")]
   [Item("TypeCompatibilityConstraint", "A constraint that checks for compatible types.")]
   public class TypeCompatibilityConstraint : Constraint {
     [StorableConstructor]
-    protected TypeCompatibilityConstraint(bool deserializing) : base(deserializing) { }
+    protected TypeCompatibilityConstraint(StorableConstructorFlag _) : base(_) { }
     protected TypeCompatibilityConstraint(TypeCompatibilityConstraint original, Cloner cloner) : base(original, cloner) { }
     public TypeCompatibilityConstraint() : base() { }