Changeset 16724 for branches/2521_ProblemRefactoring/HeuristicLab.Optimization

Timestamp:

03/28/19 17:18:28 (6 years ago)

Author:

mkommend

Message:

#2521: Corrected compilation errors in some projects.

Location:

branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3

Files:

• BasicProblems/CombinedSolution.cs (modified) (2 diffs)
• BasicProblems/Operators/MultiEncodingOperator.cs (modified) (1 diff)
• MetaOptimizers/BatchRun.cs (modified) (1 diff)
• Problems/Problem.cs (modified) (1 diff)
• RunCollection.cs (modified) (1 diff)

branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/CombinedSolution.cs

@@ -24 +24 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Optimization {
   [Item("CombinedSolution", "A solution that consists of other solutions.")]
-  [StorableClass]
+  [StorableType("B5ED00CB-E533-4ED6-AB2D-95BF7A654AAD")]
   public sealed class CombinedSolution : Item, ISolution {
 
@@ -35 +35 @@
 
     [StorableConstructor]
-    private CombinedSolution(bool deserializing) : base(deserializing) { }
+    private CombinedSolution(StorableConstructorFlag _) : base(_) { }
     private CombinedSolution(CombinedSolution original, Cloner cloner)
       : base(original, cloner) {

branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/Operators/MultiEncodingOperator.cs

@@ -39 +39 @@
     }
 
-        encoding.OperatorsChanged += Encoding_OperatorsChanged;
     [StorableConstructor]
     protected MultiEncodingOperator(StorableConstructorFlag _) : base(_) { }

branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/MetaOptimizers/BatchRun.cs

@@ -112 +112 @@
     // BackwardsCompatibility3.3
     #region Backwards compatible code (remove with 3.4)
-    [Storable(AllowOneWay = true)]
+    [Storable(Name ="algorithm")]
     private IAlgorithm algorithm {
       set { optimizer = value; }

branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/Problems/Problem.cs

@@ -84 +84 @@
     // BackwardsCompatibility3.3
     #region Backwards compatible code, remove with 3.4
-    [Storable(Name = "Operators", AllowOneWay = true)]
+    [Storable(Name = "Operators")]
     private IEnumerable<IOperator> StorableOperators {
       set {

branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/RunCollection.cs

@@ -125 +125 @@
     // BackwardsCompatibility3.3
     #region Backwards compatible code, remove with 3.4
-    [Storable(AllowOneWay = true)]
+    [Storable]
     private string AlgorithmName {
       set { optimizerName = value; }