Changeset 16723 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.Orienteering

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.Problems.Orienteering/3.3/Analyzers/BestOrienteeringSolutionAnalyzer.cs (modified) (3 diffs)
• HeuristicLab.Problems.Orienteering/3.3/Creators/GreedyOrienteeringTourCreator.cs (modified) (4 diffs)
• HeuristicLab.Problems.Orienteering/3.3/DistanceMatrix.cs (modified) (3 diffs)
• HeuristicLab.Problems.Orienteering/3.3/Evaluators/OrienteeringEvaluator.cs (modified) (3 diffs)
• HeuristicLab.Problems.Orienteering/3.3/HeuristicLab.Problems.Orienteering-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Problems.Orienteering/3.3/Improvers/OrienteeringLocalImprovementOperator.cs (modified) (4 diffs)
• HeuristicLab.Problems.Orienteering/3.3/Interfaces/IOrienteeringEvaluator.cs (modified) (2 diffs)
• HeuristicLab.Problems.Orienteering/3.3/Interfaces/IOrienteeringSolutionCreator.cs (modified) (2 diffs)
• HeuristicLab.Problems.Orienteering/3.3/OrienteeringEvaluationResult.cs (modified) (2 diffs)
• HeuristicLab.Problems.Orienteering/3.3/OrienteeringProblem.cs (modified) (4 diffs)
• HeuristicLab.Problems.Orienteering/3.3/OrienteeringSolution.cs (modified) (3 diffs)
• HeuristicLab.Problems.Orienteering/3.3/Plugin.cs.frame (modified) (2 diffs)
• HeuristicLab.Problems.Orienteering/3.3/Properties/AssemblyInfo.cs.frame (modified) (1 diff)
• HeuristicLab.Problems.Orienteering/3.3/Shakers/OrienteeringShakingOperator.cs (modified) (5 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Problems.Orienteering/3.3/Analyzers/BestOrienteeringSolutionAnalyzer.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.Orienteering {
-  [StorableClass]
+  [StorableType("6E07CAD7-20ED-4507-B2BB-B7393D9BBB95")]
   public sealed class BestOrienteeringSolutionAnalyzer : SingleSuccessorOperator, IAnalyzer {
     public bool EnabledByDefault {
@@ -79 +79 @@
 
     [StorableConstructor]
-    private BestOrienteeringSolutionAnalyzer(bool deserializing) : base(deserializing) { }
+    private BestOrienteeringSolutionAnalyzer(StorableConstructorFlag _) : base(_) { }
     private BestOrienteeringSolutionAnalyzer(BestOrienteeringSolutionAnalyzer original, Cloner cloner) : base(original, cloner) { }
     public override IDeepCloneable Clone(Cloner cloner) {

branches/2521_ProblemRefactoring/HeuristicLab.Problems.Orienteering/3.3/Creators/GreedyOrienteeringTourCreator.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.Encodings.IntegerVectorEncoding;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Problems.Orienteering {
@@ -39 +39 @@
   /// </summary>
   [Item("GreedyOrienteeringTourCreator", @"Implements the solution creation procedure described in Schilde M., Doerner K.F., Hartl R.F., Kiechle G. 2009. Metaheuristics for the bi-objective orienteering problem. Swarm Intelligence, Volume 3, Issue 3, pp 179-201.")]
-  [StorableClass]
+  [StorableType("FB68525D-DD53-4BE7-A6B4-EC54E6FD0E64")]
   public sealed class GreedyOrienteeringTourCreator : IntegerVectorCreator, IOrienteeringSolutionCreator {
     public override bool CanChangeName { get { return false; } }
@@ -65 +65 @@
 
     [StorableConstructor]
-    private GreedyOrienteeringTourCreator(bool deserializing)
-      : base(deserializing) { }
+    private GreedyOrienteeringTourCreator(StorableConstructorFlag _) : base(_) { }
     private GreedyOrienteeringTourCreator(GreedyOrienteeringTourCreator original, Cloner cloner)
       : base(original, cloner) { }

branches/2521_ProblemRefactoring/HeuristicLab.Problems.Orienteering/3.3/DistanceMatrix.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.Core;
 using HeuristicLab.Data;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Problems.Orienteering {
@@ -32 +32 @@
   /// </summary>
   [Item("DistanceMatrix", "Represents a distance matrix of a Orienteering Problem.")]
-  [StorableClass]
+  [StorableType("8318D250-3F2D-4A4D-9833-AB4EA453A3A4")]
   public sealed class DistanceMatrix : DoubleMatrix {
     [StorableConstructor]
-    private DistanceMatrix(bool deserializing) : base(deserializing) { }
+    private DistanceMatrix(StorableConstructorFlag _) : base(_) { }
     private DistanceMatrix(DistanceMatrix original, Cloner cloner) {
       throw new NotSupportedException("Distance matrices cannot be cloned.");

branches/2521_ProblemRefactoring/HeuristicLab.Problems.Orienteering/3.3/Evaluators/OrienteeringEvaluator.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.Operators;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Problems.Orienteering {
   [Item("OrienteeringEvaluator", "Operator to evaluate a solution to the orienteering problem.")]
-  [StorableClass]
+  [StorableType("ACAC24FD-9FBC-4722-BFB0-21BFEF02C2D1")]
   public class OrienteeringEvaluator : InstrumentedOperator, IOrienteeringEvaluator {
 
@@ -62 +62 @@
 
     [StorableConstructor]
-    protected OrienteeringEvaluator(bool deserializing)
-      : base(deserializing) {
+    protected OrienteeringEvaluator(StorableConstructorFlag _) : base(_) {
     }
     protected OrienteeringEvaluator(OrienteeringEvaluator original, Cloner cloner)

branches/2521_ProblemRefactoring/HeuristicLab.Problems.Orienteering/3.3/HeuristicLab.Problems.Orienteering-3.3.csproj

@@ -10 +10 @@
     <RootNamespace>HeuristicLab.Problems.Orienteering</RootNamespace>
     <AssemblyName>HeuristicLab.Problems.Orienteering-3.3</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
@@ -190 +190 @@
     </ProjectReference>
   </ItemGroup>
-  <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" />
   <PropertyGroup>

branches/2521_ProblemRefactoring/HeuristicLab.Problems.Orienteering/3.3/Improvers/OrienteeringLocalImprovementOperator.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.
@@ -29 +29 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Problems.Orienteering {
@@ -38 +38 @@
   /// </summary>
   [Item("OrienteeringLocalImprovementOperator", @"Implements the iterative improvement procedure described in Schilde M., Doerner K.F., Hartl R.F., Kiechle G. 2009. Metaheuristics for the bi-objective orienteering problem. Swarm Intelligence, Volume 3, Issue 3, pp 179-201.")]
-  [StorableClass]
+  [StorableType("92FA69B3-F243-4D12-A67A-AA1D7EBCD302")]
   public sealed class OrienteeringLocalImprovementOperator : SingleSuccessorOperator, ILocalImprovementOperator {
 
@@ -89 +89 @@
 
     [StorableConstructor]
-    private OrienteeringLocalImprovementOperator(bool deserializing) : base(deserializing) { }
+    private OrienteeringLocalImprovementOperator(StorableConstructorFlag _) : base(_) { }
     private OrienteeringLocalImprovementOperator(OrienteeringLocalImprovementOperator original, Cloner cloner)
       : base(original, cloner) {

branches/2521_ProblemRefactoring/HeuristicLab.Problems.Orienteering/3.3/Interfaces/IOrienteeringEvaluator.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.Encodings.IntegerVectorEncoding;
 using HeuristicLab.Optimization;
+using HEAL.Attic;
 
 namespace HeuristicLab.Problems.Orienteering {
+  [StorableType("4F942163-D321-4935-BF2E-780193BE9FFE")]
   public interface IOrienteeringEvaluator : ISingleObjectiveEvaluator {
     ILookupParameter<IntegerVector> IntegerVectorParameter { get; }

branches/2521_ProblemRefactoring/HeuristicLab.Problems.Orienteering/3.3/Interfaces/IOrienteeringSolutionCreator.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.Data;
 using HeuristicLab.Encodings.IntegerVectorEncoding;
+using HEAL.Attic;
 
 namespace HeuristicLab.Problems.Orienteering {
+  [StorableType("7E0D4527-4D8C-4FBA-BB3A-26F20B6463ED")]
   public interface IOrienteeringSolutionCreator : IIntegerVectorCreator {
     ILookupParameter<DistanceMatrix> DistanceMatrixParameter { get; }

branches/2521_ProblemRefactoring/HeuristicLab.Problems.Orienteering/3.3/OrienteeringEvaluationResult.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.
@@ -21 +21 @@
 
 using HeuristicLab.Data;
+using HEAL.Attic;
 
 namespace HeuristicLab.Problems.Orienteering {
+  [StorableType("A7F34447-A3C9-4FB5-B52F-5143434B4084")]
   public class OrienteeringEvaluationResult {
+    [Storable]
     public DoubleValue Quality;
+    [Storable]
     public DoubleValue Penalty;
+    [Storable]
     public DoubleValue Distance;
+
+    [StorableConstructor]
+    protected OrienteeringEvaluationResult(StorableConstructorFlag _) {
+    }
+
+    public OrienteeringEvaluationResult() { }
   }
 }

branches/2521_ProblemRefactoring/HeuristicLab.Problems.Orienteering/3.3/OrienteeringProblem.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.
@@ -31 +31 @@
 using HeuristicLab.Optimization.Operators;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 using HeuristicLab.Problems.Instances;
 using HeuristicLab.Problems.Instances.Types;
@@ -38 +38 @@
   [Item("Orienteering Problem (OP)", "Represents a single-objective Orienteering Problem.")]
   [Creatable(CreatableAttribute.Categories.CombinatorialProblems, Priority = 115)]
-  [StorableClass]
+  [StorableType("0B8DB4A4-F183-4368-86C6-C51289B183D2")]
   public sealed class OrienteeringProblem
     : SingleObjectiveHeuristicOptimizationProblem<IOrienteeringEvaluator, IOrienteeringSolutionCreator>,
@@ -113 +113 @@
 
     [StorableConstructor]
-    private OrienteeringProblem(bool deserializing)
-      : base(deserializing) {
+    private OrienteeringProblem(StorableConstructorFlag _) : base(_) {
     }
     private OrienteeringProblem(OrienteeringProblem original, Cloner cloner)

branches/2521_ProblemRefactoring/HeuristicLab.Problems.Orienteering/3.3/OrienteeringSolution.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.Data;
 using HeuristicLab.Encodings.IntegerVectorEncoding;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Problems.Orienteering {
   [Item("OrienteeringSolution", "Represents a Orienteering solution which can be visualized in the GUI.")]
-  [StorableClass]
+  [StorableType("BC58ED08-B9A7-40F3-B8E0-A6B33AA993F4")]
   public sealed class OrienteeringSolution : Item {
     public static new Image StaticItemImage {
@@ -142 +142 @@
 
     [StorableConstructor]
-    private OrienteeringSolution(bool deserializing)
-      : base(deserializing) { }
+    private OrienteeringSolution(StorableConstructorFlag _) : base(_) { }
     private OrienteeringSolution(OrienteeringSolution original, Cloner cloner)
       : base(original, cloner) {

branches/2521_ProblemRefactoring/HeuristicLab.Problems.Orienteering/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.
@@ -39 +39 @@
   [PluginDependency("HeuristicLab.Optimization.Operators", "3.3")]
   [PluginDependency("HeuristicLab.Parameters", "3.3")]
-  [PluginDependency("HeuristicLab.Persistence", "3.3")]
+  [PluginDependency("HeuristicLab.Attic", "1.0")]
   [PluginDependency("HeuristicLab.Problems.Instances", "3.3")]
   public class HeuristicLabProblemsOrienteeringPlugin : PluginBase {    }

branches/2521_ProblemRefactoring/HeuristicLab.Problems.Orienteering/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.Problems.Orienteering/3.3/Shakers/OrienteeringShakingOperator.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.
@@ -29 +29 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Attic;
 
 namespace HeuristicLab.Problems.Orienteering {
@@ -48 +48 @@
   /// </summary>
   [Item("OrienteeringShakingOperator", @"Implements the shaking procedure described in Schilde M., Doerner K.F., Hartl R.F., Kiechle G. 2009. Metaheuristics for the bi-objective orienteering problem. Swarm Intelligence, Volume 3, Issue 3, pp 179-201.")]
-  [StorableClass]
+  [StorableType("D6654BD1-63CD-4057-89C8-36D1EE6EA7DF")]
   public sealed class OrienteeringShakingOperator : SingleSuccessorOperator, IMultiNeighborhoodShakingOperator, IStochasticOperator {
 
@@ -89 +89 @@
 
     [StorableConstructor]
-    private OrienteeringShakingOperator(bool deserializing) : base(deserializing) { }
+    private OrienteeringShakingOperator(StorableConstructorFlag _) : base(_) { }
     private OrienteeringShakingOperator(OrienteeringShakingOperator original, Cloner cloner)
       : base(original, cloner) {
@@ -241 +241 @@
     }
 
+    [StorableType("8E380F4E-D9C2-4671-ABF8-A28E14B22BA2")]
     private class SavingInfo {
       public int Index;