Changeset 16710 for branches/2936_GQAPIntegration/HeuristicLab.Encodings.IntegerVectorEncoding/3.3/Manipulators

Timestamp:

03/25/19 17:11:06 (5 years ago)

Author:

gkronber

Message:

#2936: merged r15682 & r16117:16658 from trunk/HeuristicLab.Encodings.IntegerVectorEncoding to branch/HeuristicLab.Encodings.IntegerVectorEncoding

Location:

branches/2936_GQAPIntegration/HeuristicLab.Encodings.IntegerVectorEncoding

Files:

• . (modified) (1 prop)
• 3.3/Manipulators/RoundedNormalAllPositionsManipulator.cs (modified) (5 diffs)
• 3.3/Manipulators/SelfAdaptiveRoundedNormalAllPositionsManipulator.cs (modified) (4 diffs)
• 3.3/Manipulators/UniformOnePositionManipulator.cs (modified) (3 diffs)
• 3.3/Manipulators/UniformSomePositionsManipulator.cs (modified) (4 diffs)

branches/2936_GQAPIntegration/HeuristicLab.Encodings.IntegerVectorEncoding/3.3/Manipulators/RoundedNormalAllPositionsManipulator.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.Data;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 using HeuristicLab.Random;
 
@@ -34 +34 @@
   /// </summary>
   [Item("RoundedNormalAllPositionsManipulator", "This manipulation operator adds a value sigma_i * N_i(0,1) to the current value in each position i given the values for sigma_i in the parameter. The result is rounded to the next feasible value. If there are less elements in Sigma than positions, then Sigma is cycled.")]
-  [StorableClass]
+  [StorableType("CDAE115B-1BAD-4CC2-B63E-E3C45955175D")]
   public class RoundedNormalAllPositionsManipulator : BoundedIntegerVectorManipulator {
 
@@ -42 +42 @@
 
     [StorableConstructor]
-    protected RoundedNormalAllPositionsManipulator(bool deserializing) : base(deserializing) { }
+    protected RoundedNormalAllPositionsManipulator(StorableConstructorFlag _) : base(_) { }
     protected RoundedNormalAllPositionsManipulator(RoundedNormalAllPositionsManipulator original, Cloner cloner) : base(original, cloner) { }
     /// <summary>
@@ -75 +75 @@
         if (bounds.Columns > 2) step = bounds[i % bounds.Rows, 2];
 
-        int value = (vector[i] + (int)Math.Round((N.NextDouble() * sigma[i % sigma.Length])) - min) / step;
+        double value = vector[i] + N.NextDouble() * sigma[i % sigma.Length];
         max = FloorFeasible(min, max, step, max - 1);
         vector[i] = RoundFeasible(min, max, step, value);

branches/2936_GQAPIntegration/HeuristicLab.Encodings.IntegerVectorEncoding/3.3/Manipulators/SelfAdaptiveRoundedNormalAllPositionsManipulator.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.
@@ -26 +26 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 using HeuristicLab.Random;
 
@@ -35 +35 @@
   /// </summary>
   [Item("SelfAdaptiveRoundedNormalAllPositionsManipulator", "This manipulation operator adds a value sigma_i * N(0,1) to the current value in each position i. The resulting value is rounded to the next feasible value. The values for sigma_i are looked up dynamically. If there are less elements in the strategy vector than positions, then the strategy vector is cycled.")]
-  [StorableClass]
+  [StorableType("2CD4AE6E-3A73-4514-AB66-4D94C700F779")]
   public class SelfAdaptiveRoundedNormalAllPositionsManipulator : BoundedIntegerVectorManipulator, ISelfAdaptiveManipulator {
     public Type StrategyParameterType {
@@ -52 +52 @@
 
     [StorableConstructor]
-    protected SelfAdaptiveRoundedNormalAllPositionsManipulator(bool deserializing) : base(deserializing) { }
+    protected SelfAdaptiveRoundedNormalAllPositionsManipulator(StorableConstructorFlag _) : base(_) { }
     protected SelfAdaptiveRoundedNormalAllPositionsManipulator(SelfAdaptiveRoundedNormalAllPositionsManipulator original, Cloner cloner) : base(original, cloner) { }
     /// <summary>

branches/2936_GQAPIntegration/HeuristicLab.Encodings.IntegerVectorEncoding/3.3/Manipulators/UniformOnePositionManipulator.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.Data;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Encodings.IntegerVectorEncoding {
@@ -35 +35 @@
   /// </remarks>
   [Item("UniformOnePositionManipulator", " Uniformly distributed change of a single position of an integer vector. It is implemented as described in Michalewicz, Z. 1999. Genetic Algorithms + Data Structures = Evolution Programs. Third, Revised and Extended Edition, Spring-Verlag Berlin Heidelberg.")]
-  [StorableClass]
+  [StorableType("205791F7-231F-4957-B27E-387161BF56F0")]
   public class UniformOnePositionManipulator : BoundedIntegerVectorManipulator {
 
     [StorableConstructor]
-    protected UniformOnePositionManipulator(bool deserializing) : base(deserializing) { }
+    protected UniformOnePositionManipulator(StorableConstructorFlag _) : base(_) { }
     protected UniformOnePositionManipulator(UniformOnePositionManipulator original, Cloner cloner) : base(original, cloner) { }
     /// <summary>

branches/2936_GQAPIntegration/HeuristicLab.Encodings.IntegerVectorEncoding/3.3/Manipulators/UniformSomePositionsManipulator.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.Data;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Encodings.IntegerVectorEncoding {
@@ -35 +35 @@
   /// </remarks>
   [Item("UniformSomePositionsManipulator", "Uniformly distributed change of several, but at least one, positions of an integer vector. It is implemented as described in Michalewicz, Z. 1999. Genetic Algorithms + Data Structures = Evolution Programs. Third, Revised and Extended Edition, Spring-Verlag Berlin Heidelberg.")]
-  [StorableClass]
+  [StorableType("1A0F372D-7256-41EA-B825-9173BC1E278B")]
   public class UniformSomePositionsManipulator : BoundedIntegerVectorManipulator {
 
@@ -43 +43 @@
 
     [StorableConstructor]
-    protected UniformSomePositionsManipulator(bool deserializing) : base(deserializing) { }
+    protected UniformSomePositionsManipulator(StorableConstructorFlag _) : base(_) { }
     protected UniformSomePositionsManipulator(UniformSomePositionsManipulator original, Cloner cloner) : base(original, cloner) { }
     public UniformSomePositionsManipulator()