Changeset 16956 for branches/2457_ExpertSystem/HeuristicLab.Optimization/3.3/RunCollectionConstraints

Timestamp:

05/15/19 13:36:51 (6 years ago)

Author:

abeham

Message:

#2457: merged trunk into branch

Location:

branches/2457_ExpertSystem/HeuristicLab.Optimization

Files:

• . (modified) (1 prop)
• 3.3/RunCollectionConstraints/IRunCollectionConstraint.cs (modified) (2 diffs)
• 3.3/RunCollectionConstraints/RunCollectionComparisonConstraint.cs (modified) (2 diffs)
• 3.3/RunCollectionConstraints/RunCollectionConstraintCollection.cs (modified) (3 diffs)
• 3.3/RunCollectionConstraints/RunCollectionContentConstraint.cs (modified) (3 diffs)
• 3.3/RunCollectionConstraints/RunCollectionEqualityConstraint.cs (modified) (2 diffs)
• 3.3/RunCollectionConstraints/RunCollectionTypeCompatiblityConstraint.cs (modified) (2 diffs)

branches/2457_ExpertSystem/HeuristicLab.Optimization/3.3/RunCollectionConstraints/IRunCollectionConstraint.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 HeuristicLab.Core;
+using HEAL.Attic;
 
 namespace HeuristicLab.Optimization {
+  [StorableType("c54d5084-fee2-4c94-be62-924b014d180d")]
   public interface IRunCollectionConstraint : IConstraint {
     new RunCollection ConstrainedValue { get; set; }
   }
 
+  [StorableType("9e35dfa2-f197-4212-841f-d52e91a297e0")]
   public interface IRunCollectionColumnConstraint : IRunCollectionConstraint {
     string ConstraintColumn { get; set; }

branches/2457_ExpertSystem/HeuristicLab.Optimization/3.3/RunCollectionConstraints/RunCollectionComparisonConstraint.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.
@@ -25 +25 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Optimization {
-  [StorableClass]
+  [StorableType("655E544A-F75E-4020-BA97-F511CB4D059F")]
   [Item("RunCollectionComparisonConstraint", "A constraint which compares the members of the contained runs with the constraint data.")]
   public class RunCollectionComparisonConstraint : ComparisonConstraint, IRunCollectionColumnConstraint {
     [StorableConstructor]
-    protected RunCollectionComparisonConstraint(bool deserializing) : base(deserializing) { }
+    protected RunCollectionComparisonConstraint(StorableConstructorFlag _) : base(_) { }
 
     protected RunCollectionComparisonConstraint(RunCollectionComparisonConstraint original, Cloner cloner)

branches/2457_ExpertSystem/HeuristicLab.Optimization/3.3/RunCollectionConstraints/RunCollectionConstraintCollection.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 HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Optimization {
-  [StorableClass]
+  [StorableType("39066245-2B02-4B41-BEA3-158A4E21FCC1")]
   [Item("RunCollectionConstraintCollection", "Represents a collection of constraints.")]
   public class RunCollectionConstraintCollection : ItemCollection<IRunCollectionConstraint> {
@@ -32 +32 @@
     public RunCollectionConstraintCollection(IEnumerable<IRunCollectionConstraint> collection) : base(collection) { }
     [StorableConstructor]
-    protected RunCollectionConstraintCollection(bool deserializing) : base(deserializing) { }
+    protected RunCollectionConstraintCollection(StorableConstructorFlag _) : base(_) { }
     protected RunCollectionConstraintCollection(RunCollectionConstraintCollection original, Cloner cloner)
       : base(original, cloner) {

branches/2457_ExpertSystem/HeuristicLab.Optimization/3.3/RunCollectionConstraints/RunCollectionContentConstraint.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.
@@ -25 +25 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Optimization {
-  [StorableClass]
+  [StorableType("E155F5BA-C93F-43F2-A513-A79AEF8F0043")]
   public class RunCollectionContentConstraint : Constraint, IRunCollectionConstraint {
     public new RunCollection ConstrainedValue {
@@ -45 +45 @@
 
     [StorableConstructor]
-    protected RunCollectionContentConstraint(bool deserializing) : base(deserializing) { }
+    protected RunCollectionContentConstraint(StorableConstructorFlag _) : base(_) { }
     [StorableHook(HookType.AfterDeserialization)]
     private void AfterDeserialization() {

branches/2457_ExpertSystem/HeuristicLab.Optimization/3.3/RunCollectionConstraints/RunCollectionEqualityConstraint.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.
@@ -25 +25 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Optimization {
-  [StorableClass]
+  [StorableType("FF40D38E-3F80-4448-A1AE-94B556EF2B9D")]
   [Item("RunCollectionEqualityConstraint", "A constraint which checks the members of the contained runs for equality to the constraint data.")]
   public class RunCollectionEqualityConstraint : EqualityConstraint, IRunCollectionColumnConstraint {
     [StorableConstructor]
-    protected RunCollectionEqualityConstraint(bool deserializing) : base(deserializing) { }
+    protected RunCollectionEqualityConstraint(StorableConstructorFlag _) : base(_) { }
 
     protected RunCollectionEqualityConstraint(RunCollectionEqualityConstraint original, Cloner cloner)

branches/2457_ExpertSystem/HeuristicLab.Optimization/3.3/RunCollectionConstraints/RunCollectionTypeCompatiblityConstraint.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.
@@ -25 +25 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Optimization {
-  [StorableClass]
+  [StorableType("3B3B486C-0552-4B0D-978D-813E71E21B79")]
   [Item("RunCollectionTypeCompatibilityConstraint", "A constraint which checks the members of the contained runs for type compabitiliby to the constraint data.")]
   public class RunCollectionTypeCompatibilityConstraint : TypeCompatibilityConstraint, IRunCollectionColumnConstraint {
     [StorableConstructor]
-    protected RunCollectionTypeCompatibilityConstraint(bool deserializing) {
+    protected RunCollectionTypeCompatibilityConstraint(StorableConstructorFlag _) : base(_) {
     }
     protected RunCollectionTypeCompatibilityConstraint(RunCollectionTypeCompatibilityConstraint original, Cloner cloner)