Changeset 16565 for trunk/HeuristicLab.Problems.Scheduling/3.3/Evaluators

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.Problems.Scheduling/3.3/Evaluators/MakespanEvaluator.cs (modified) (2 diffs)
• HeuristicLab.Problems.Scheduling/3.3/Evaluators/MeanTardinessEvaluator.cs (modified) (2 diffs)
• HeuristicLab.Problems.Scheduling/3.3/Evaluators/ScheduleEvaluator.cs (modified) (3 diffs)
• HeuristicLab.Problems.Scheduling/3.3/Evaluators/SchedulingEvaluator.cs (modified) (3 diffs)

trunk/HeuristicLab.Problems.Scheduling/3.3/Evaluators/MakespanEvaluator.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 HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Data;
 using HeuristicLab.Encodings.ScheduleEncoding;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Problems.Scheduling {
   [Item("Makespan Evaluator", "Represents an evaluator using the maximum makespan of a schedule.")]
-  [StorableClass]
+  [StorableType("DCD90872-1FF9-482F-8FCF-AD34AC6DF051")]
   public class MakespanEvaluator : ScheduleEvaluator {
 
     [StorableConstructor]
-    protected MakespanEvaluator(bool deserializing) : base(deserializing) { }
+    protected MakespanEvaluator(StorableConstructorFlag _) : base(_) { }
     protected MakespanEvaluator(MakespanEvaluator original, Cloner cloner) : base(original, cloner) {}
     public MakespanEvaluator()

trunk/HeuristicLab.Problems.Scheduling/3.3/Evaluators/MeanTardinessEvaluator.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 HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Data;
 using HeuristicLab.Encodings.ScheduleEncoding;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Problems.Scheduling {
   [Item("Mean tardiness Evaluator", "Represents an evaluator using the mean tardiness of a schedule.")]
-  [StorableClass]
+  [StorableType("75C00D86-4C81-43EC-A2D4-60736509C97E")]
   public class MeanTardinessEvaluator : ScheduleEvaluator, IJSSPOperator {
 
     [StorableConstructor]
-    protected MeanTardinessEvaluator(bool deserializing) : base(deserializing) { }
+    protected MeanTardinessEvaluator(StorableConstructorFlag _) : base(_) { }
     protected MeanTardinessEvaluator(MeanTardinessEvaluator original, Cloner cloner) : base(original, cloner) { }
     public override IDeepCloneable Clone(Cloner cloner) {

trunk/HeuristicLab.Problems.Scheduling/3.3/Evaluators/ScheduleEvaluator.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.Encodings.ScheduleEncoding;
 using HeuristicLab.Operators;
-using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Problems.Scheduling {
   [Item("Schedule Evaluator", "Represents a base class for schedule evaluators.")]
-  [StorableClass]
+  [StorableType("F006A09C-C92E-4523-84B0-CF763A652C56")]
   public abstract class ScheduleEvaluator : InstrumentedOperator, IScheduleEvaluator {
 
@@ -42 +41 @@
 
     [StorableConstructor]
-    protected ScheduleEvaluator(bool deserializing) : base(deserializing) { }
+    protected ScheduleEvaluator(StorableConstructorFlag _) : base(_) { }
     protected ScheduleEvaluator(ScheduleEvaluator original, Cloner cloner) : base(original, cloner) { }
     protected ScheduleEvaluator()

trunk/HeuristicLab.Problems.Scheduling/3.3/Evaluators/SchedulingEvaluator.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.
@@ -28 +28 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Problems.Scheduling {
   [Item("SchedulingEvaluator", "First applies the decoder operator to obtain a schedule from an encoding and then applies the evaluator to obtain a quality.")]
-  [StorableClass]
+  [StorableType("A7AED7B7-C431-4E39-A002-8CBCA6223BCD")]
   public class SchedulingEvaluator : InstrumentedOperator, ISchedulingEvaluator, IStochasticOperator {
 
@@ -59 +59 @@
 
     [StorableConstructor]
-    protected SchedulingEvaluator(bool deserializing) : base(deserializing) { }
+    protected SchedulingEvaluator(StorableConstructorFlag _) : base(_) { }
     protected SchedulingEvaluator(SchedulingEvaluator original, Cloner cloner) : base(original, cloner) { }
     public SchedulingEvaluator()