Changeset 16956 for branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/Scramble

Timestamp:

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

Author:

abeham

Message:

#2457: merged trunk into branch

Location:

branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding

Files:

• . (modified) (1 prop)
• 3.3/Moves/Scramble/ScrambleMove.cs (modified) (3 diffs)
• 3.3/Moves/Scramble/ScrambleMoveGenerator.cs (modified) (3 diffs)
• 3.3/Moves/Scramble/ScrambleMoveMaker.cs (modified) (3 diffs)
• 3.3/Moves/Scramble/StochasticScrambleMultiMoveGenerator.cs (modified) (3 diffs)

branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/Scramble/ScrambleMove.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2016 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.Encodings.PermutationEncoding {
   [Item("ScrambleMove", "Item that describes a scramble move.")]
-  [StorableClass]
+  [StorableType("DBE9C007-10AA-4B8A-8092-23C9ACBA411A")]
   public sealed class ScrambleMove : Item {
     [Storable]
@@ -34 +34 @@
 
     [StorableConstructor]
-    private ScrambleMove(bool deserializing) : base(deserializing) { }
+    private ScrambleMove(StorableConstructorFlag _) : base(_) { }
     private ScrambleMove(ScrambleMove original, Cloner cloner)
       : base(original, cloner) {

branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/Scramble/ScrambleMoveGenerator.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2016 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.Optimization;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Encodings.PermutationEncoding {
   [Item("ScrambleMoveGenerator", "Base class for all scramble move generators.")]
-  [StorableClass]
+  [StorableType("053A3BFC-F5F1-4893-B5E8-BCB452D18FC1")]
   public abstract class ScrambleMoveGenerator : SingleSuccessorOperator, IPermutationScrambleMoveOperator, IMoveGenerator {
     public override bool CanChangeName {
@@ -42 +42 @@
 
     [StorableConstructor]
-    protected ScrambleMoveGenerator(bool deserializing) : base(deserializing) { }
+    protected ScrambleMoveGenerator(StorableConstructorFlag _) : base(_) { }
     protected ScrambleMoveGenerator(ScrambleMoveGenerator original, Cloner cloner) : base(original, cloner) { }
     public ScrambleMoveGenerator()

branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/Scramble/ScrambleMoveMaker.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -26 +26 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Encodings.PermutationEncoding {
   [Item("ScrambleMoveMaker", "Peforms a scramble move on a given permutation and updates the quality.")]
-  [StorableClass]
+  [StorableType("5DC6735A-F109-4D86-98CF-B8CCB648D3D3")]
   public class ScrambleMoveMaker : SingleSuccessorOperator, IPermutationScrambleMoveOperator, IMoveMaker, ISingleObjectiveOperator {
     public override bool CanChangeName {
@@ -49 +49 @@
 
     [StorableConstructor]
-    protected ScrambleMoveMaker(bool deserializing) : base(deserializing) { }
+    protected ScrambleMoveMaker(StorableConstructorFlag _) : base(_) { }
     protected ScrambleMoveMaker(ScrambleMoveMaker original, Cloner cloner) : base(original, cloner) { }
     public ScrambleMoveMaker()

branches/2457_ExpertSystem/HeuristicLab.Encodings.PermutationEncoding/3.3/Moves/Scramble/StochasticScrambleMultiMoveGenerator.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -27 +27 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Encodings.PermutationEncoding {
   [Item("StochasticScrambleMultiMoveGenerator", "Randomly samples n from all possible scramble moves from a given permutation.")]
-  [StorableClass]
+  [StorableType("ECC7549D-404B-459A-A01E-6E00A53E58F5")]
   public class StochasticScrambleMultiMoveGenerator : ScrambleMoveGenerator, IMultiMoveGenerator, IStochasticOperator {
     public ILookupParameter<IRandom> RandomParameter {
@@ -46 +46 @@
 
     [StorableConstructor]
-    protected StochasticScrambleMultiMoveGenerator(bool deserializing) : base(deserializing) { }
+    protected StochasticScrambleMultiMoveGenerator(StorableConstructorFlag _) : base(_) { }
     protected StochasticScrambleMultiMoveGenerator(StochasticScrambleMultiMoveGenerator original, Cloner cloner) : base(original, cloner) { }
     public StochasticScrambleMultiMoveGenerator()