Changeset 16723 for branches/2521_ProblemRefactoring/HeuristicLab.Algorithms.ScatterSearch

Timestamp:

03/28/19 16:54:20 (6 years ago)

Author:

abeham

Message:

#2521: merged changes from r15684 to trunk HEAD (r16716) and resolved all merge conflicts

• it doesn't build

Location:

branches/2521_ProblemRefactoring

Files:

• . (modified) (1 prop)
• HeuristicLab.Algorithms.ScatterSearch/3.3/HeuristicLab.Algorithms.ScatterSearch-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Algorithms.ScatterSearch/3.3/OffspringProcessor.cs (modified) (4 diffs)
• HeuristicLab.Algorithms.ScatterSearch/3.3/Plugin.cs.frame (modified) (2 diffs)
• HeuristicLab.Algorithms.ScatterSearch/3.3/PopulationRebuildMethod.cs (modified) (4 diffs)
• HeuristicLab.Algorithms.ScatterSearch/3.3/Properties/AssemblyInfo.cs.frame (modified) (1 diff)
• HeuristicLab.Algorithms.ScatterSearch/3.3/ReferenceSetUpdateMethod.cs (modified) (4 diffs)
• HeuristicLab.Algorithms.ScatterSearch/3.3/ScatterSearch.cs (modified) (4 diffs)
• HeuristicLab.Algorithms.ScatterSearch/3.3/ScatterSearchMainLoop.cs (modified) (4 diffs)
• HeuristicLab.Algorithms.ScatterSearch/3.3/SolutionPoolUpdateMethod.cs (modified) (4 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Algorithms.ScatterSearch/3.3/HeuristicLab.Algorithms.ScatterSearch-3.3.csproj

@@ -11 +11 @@
     <RootNamespace>HeuristicLab.Algorithms.ScatterSearch</RootNamespace>
     <AssemblyName>HeuristicLab.Algorithms.ScatterSearch-3.3</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
@@ -171 +171 @@
       <Private>False</Private>
     </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\bin\HEAL.Attic.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

branches/2521_ProblemRefactoring/HeuristicLab.Algorithms.ScatterSearch/3.3/OffspringProcessor.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.Operators;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Algorithms.ScatterSearch {
@@ -31 +31 @@
   /// </summary>
   [Item("OffspringProcessor", "An operator that creates a subscope with subscopes for every variable in the current scope.")]
-  [StorableClass]
+  [StorableType("A89D522A-CAFF-4899-A24D-5EB463EEB03F")]
   public sealed class OffspringProcessor : SingleSuccessorOperator {
     #region Parameter properties
@@ -46 +46 @@
 
     [StorableConstructor]
-    private OffspringProcessor(bool deserializing) : base(deserializing) { }
+    private OffspringProcessor(StorableConstructorFlag _) : base(_) { }
     private OffspringProcessor(OffspringProcessor original, Cloner cloner) : base(original, cloner) { }
     public OffspringProcessor()

branches/2521_ProblemRefactoring/HeuristicLab.Algorithms.ScatterSearch/3.3/Plugin.cs.frame

@@ -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.
@@ -37 +37 @@
   [PluginDependency("HeuristicLab.Optimization.Operators", "3.3")]
   [PluginDependency("HeuristicLab.Parameters", "3.3")]
-  [PluginDependency("HeuristicLab.Persistence", "3.3")]
+  [PluginDependency("HeuristicLab.Attic", "1.0")]
   [PluginDependency("HeuristicLab.Random", "3.3")]
   [PluginDependency("HeuristicLab.Selection", "3.3")]

branches/2521_ProblemRefactoring/HeuristicLab.Algorithms.ScatterSearch/3.3/PopulationRebuildMethod.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.
@@ -27 +27 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Algorithms.ScatterSearch {
@@ -34 +34 @@
   /// </summary>
   [Item("PopulationRebuildMethod", "An operator that updates the reference set and rebuilds the population.")]
-  [StorableClass]
+  [StorableType("B993B7E3-E510-4211-AD13-90517C810E34")]
   public sealed class PopulationRebuildMethod : SingleSuccessorOperator, ISingleObjectiveOperator {
     #region Parameter properties
@@ -76 +76 @@
 
     [StorableConstructor]
-    private PopulationRebuildMethod(bool deserializing) : base(deserializing) { }
+    private PopulationRebuildMethod(StorableConstructorFlag _) : base(_) { }
     private PopulationRebuildMethod(PopulationRebuildMethod original, Cloner cloner) : base(original, cloner) { }
     public PopulationRebuildMethod()

branches/2521_ProblemRefactoring/HeuristicLab.Algorithms.ScatterSearch/3.3/Properties/AssemblyInfo.cs.frame

@@ -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.

branches/2521_ProblemRefactoring/HeuristicLab.Algorithms.ScatterSearch/3.3/ReferenceSetUpdateMethod.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.Algorithms.ScatterSearch {
@@ -35 +35 @@
   /// </summary>
   [Item("ReferenceSetUpdateMethod", "An operator that updates the reference set.")]
-  [StorableClass]
+  [StorableType("478625DC-87BD-4111-98D1-45A9939198C8")]
   public sealed class ReferenceSetUpdateMethod : SingleSuccessorOperator {
     #region Parameter properties
@@ -59 +59 @@
 
     [StorableConstructor]
-    private ReferenceSetUpdateMethod(bool deserializing) : base(deserializing) { }
+    private ReferenceSetUpdateMethod(StorableConstructorFlag _) : base(_) { }
     private ReferenceSetUpdateMethod(ReferenceSetUpdateMethod original, Cloner cloner) : base(original, cloner) { }
     public ReferenceSetUpdateMethod()

branches/2521_ProblemRefactoring/HeuristicLab.Algorithms.ScatterSearch/3.3/ScatterSearch.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.
@@ -30 +30 @@
 using HeuristicLab.Optimization.Operators;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 using HeuristicLab.Random;
 using HeuristicLab.Selection;
@@ -40 +40 @@
   [Item("Scatter Search (SS)", "A scatter search algorithm.")]
   [Creatable(CreatableAttribute.Categories.PopulationBasedAlgorithms, Priority = 500)]
-  [StorableClass]
+  [StorableType("B0A218C1-8D92-4BDF-AAB7-C6396612C26B")]
   public sealed class ScatterSearch : HeuristicOptimizationEngineAlgorithm, IStorableContent {
     public string Filename { get; set; }
@@ -157 +157 @@
 
     [StorableConstructor]
-    private ScatterSearch(bool deserializing) : base(deserializing) { }
+    private ScatterSearch(StorableConstructorFlag _) : base(_) { }
     [StorableHook(HookType.AfterDeserialization)]
     private void AfterDeserialization() {

branches/2521_ProblemRefactoring/HeuristicLab.Algorithms.ScatterSearch/3.3/ScatterSearchMainLoop.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.
@@ -27 +27 @@
 using HeuristicLab.Optimization.Operators;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 using HeuristicLab.Selection;
 
@@ -35 +35 @@
   /// </summary>
   [Item("ScatterSearchMainLoop", "An operator which represents a scatter search.")]
-  [StorableClass]
+  [StorableType("CDEB69B9-A0D9-4E84-80FD-347E16A1A8FE")]
   public sealed class ScatterSearchMainLoop : AlgorithmOperator {
     #region Parameter properties
@@ -170 +170 @@
 
     [StorableConstructor]
-    private ScatterSearchMainLoop(bool deserializing) : base(deserializing) { }
+    private ScatterSearchMainLoop(StorableConstructorFlag _) : base(_) { }
     private ScatterSearchMainLoop(ScatterSearchMainLoop original, Cloner cloner) : base(original, cloner) { }
     public ScatterSearchMainLoop() : base() { Initialize(); }

branches/2521_ProblemRefactoring/HeuristicLab.Algorithms.ScatterSearch/3.3/SolutionPoolUpdateMethod.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.Algorithms.ScatterSearch {
@@ -35 +35 @@
   /// </summary>
   [Item("SolutionPoolUpdateMethod", "An operator that updates the solution pool.")]
-  [StorableClass]
+  [StorableType("F295B5C8-8551-4DFC-A38C-354E14CED2E3")]
   public sealed class SolutionPoolUpdateMethod : SingleSuccessorOperator, ISingleObjectiveOperator {
     #region Parameter properties
@@ -79 +79 @@
 
     [StorableConstructor]
-    private SolutionPoolUpdateMethod(bool deserializing) : base(deserializing) { }
+    private SolutionPoolUpdateMethod(StorableConstructorFlag _) : base(_) { }
     private SolutionPoolUpdateMethod(SolutionPoolUpdateMethod original, Cloner cloner) : base(original, cloner) { }
     public SolutionPoolUpdateMethod()