Changeset 16462 for branches/2520_PersistenceReintegration/HeuristicLab.Problems.LinearAssignment

Timestamp:

12/28/18 16:10:48 (6 years ago)

Author:

jkarder

Message:

#2520: worked on reintegration of new persistence

• added nuget references to HEAL.Fossil
• added StorableType attributes to many classes
• changed signature of StorableConstructors
• removed some classes in old persistence
• removed some unnecessary usings

Location:

branches/2520_PersistenceReintegration/HeuristicLab.Problems.LinearAssignment/3.3

Files:

• Analyzers/BestLAPSolutionAnalyzer.cs (modified) (2 diffs)
• HeuristicLab.Problems.LinearAssignment-3.3.csproj (modified) (1 diff)
• HungarianAlgorithm.cs (modified) (3 diffs)
• LAPAssignment.cs (modified) (2 diffs)
• LAPEvaluator.cs (modified) (3 diffs)
• LinearAssignmentProblem.cs (modified) (3 diffs)
• LinearAssignmentProblemSolver.cs (modified) (2 diffs)

branches/2520_PersistenceReintegration/HeuristicLab.Problems.LinearAssignment/3.3/Analyzers/BestLAPSolutionAnalyzer.cs

@@ -28 +28 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Fossil;
 
 namespace HeuristicLab.Problems.LinearAssignment {
   [Item("BestLAPSolutionAnalyzer", "Analyzes the best solution found.")]
-  [StorableClass]
+  [StorableType("7C4B1DB3-E351-4C6C-899B-801303DFCE61")]
   public class BestLAPSolutionAnalyzer : SingleSuccessorOperator, IAnalyzer, ISingleObjectiveOperator {
     public bool EnabledByDefault { get { return true; } }
@@ -71 +71 @@
 
     [StorableConstructor]
-    protected BestLAPSolutionAnalyzer(bool deserializing) : base(deserializing) { }
+    protected BestLAPSolutionAnalyzer(StorableConstructorFlag _) : base(_) { }
     protected BestLAPSolutionAnalyzer(BestLAPSolutionAnalyzer original, Cloner cloner) : base(original, cloner) { }
     public BestLAPSolutionAnalyzer()

branches/2520_PersistenceReintegration/HeuristicLab.Problems.LinearAssignment/3.3/HeuristicLab.Problems.LinearAssignment-3.3.csproj

@@ -112 +112 @@
       <HintPath>..\..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll</HintPath>
     </Reference>
-    <Reference Include="HEAL.Fossil, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="HEAL.Fossil, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
       <HintPath>..\..\packages\HEAL.Fossil.1.0.0\lib\netstandard2.0\HEAL.Fossil.dll</HintPath>
     </Reference>

branches/2520_PersistenceReintegration/HeuristicLab.Problems.LinearAssignment/3.3/HungarianAlgorithm.cs

@@ -28 +28 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Fossil;
 
 namespace HeuristicLab.Problems.LinearAssignment {
@@ -36 +36 @@
   [Item("Hungarian Algorithm", "The Hungarian algorithm can be used to solve the linear assignment problem in O(n^3). It is also known as the Kuhn–Munkres algorithm or Munkres assignment algorithm.")]
   [Creatable(CreatableAttribute.Categories.SingleSolutionAlgorithms, Priority = 170)]
-  [StorableClass]
+  [StorableType("2A2C1C1B-E0C3-4757-873B-C3F7C6D11A01")]
   public sealed class HungarianAlgorithm : EngineAlgorithm, IStorableContent {
     public string Filename { get; set; }
@@ -67 +67 @@
 
     [StorableConstructor]
-    private HungarianAlgorithm(bool deserializing) : base(deserializing) { }
+    private HungarianAlgorithm(StorableConstructorFlag _) : base(_) { }
     private HungarianAlgorithm(HungarianAlgorithm original, Cloner cloner)
       : base(original, cloner) {

branches/2520_PersistenceReintegration/HeuristicLab.Problems.LinearAssignment/3.3/LAPAssignment.cs

@@ -25 +25 @@
 using HeuristicLab.Data;
 using HeuristicLab.Encodings.PermutationEncoding;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Fossil;
 
 namespace HeuristicLab.Problems.LinearAssignment {
   [Item("LAP Assignment", "Represents a solution to the LAP.")]
-  [StorableClass]
+  [StorableType("8F255E15-291B-44D5-BF8B-AC79264274C0")]
   public sealed class LAPAssignment : Item, INotifyPropertyChanged, IStorableContent {
     public string Filename { get; set; }
@@ -89 +89 @@
 
     [StorableConstructor]
-    private LAPAssignment(bool deserializing) : base(deserializing) { }
+    private LAPAssignment(StorableConstructorFlag _) : base(_) { }
     private LAPAssignment(LAPAssignment original, Cloner cloner)
       : base(original, cloner) {

branches/2520_PersistenceReintegration/HeuristicLab.Problems.LinearAssignment/3.3/LAPEvaluator.cs

@@ -22 +22 @@
 
 using HeuristicLab.Operators;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Fossil;
 using HeuristicLab.Core;
 using HeuristicLab.Common;
@@ -31 +31 @@
 namespace HeuristicLab.Problems.LinearAssignment {
   [Item("LAPEvaluator", "Evaluates a solution to the linear assignment problem.")]
-  [StorableClass]
+  [StorableType("DB86EA88-EE30-4E57-8447-D24B7B6ACB8A")]
   public class LAPEvaluator : InstrumentedOperator, ILAPEvaluator {
 
@@ -45 +45 @@
 
     [StorableConstructor]
-    protected LAPEvaluator(bool deserializing) : base(deserializing) { }
+    protected LAPEvaluator(StorableConstructorFlag _) : base(_) { }
     protected LAPEvaluator(LAPEvaluator original, Cloner cloner) : base(original, cloner) { }
     public LAPEvaluator()

branches/2520_PersistenceReintegration/HeuristicLab.Problems.LinearAssignment/3.3/LinearAssignmentProblem.cs

@@ -31 +31 @@
 using HeuristicLab.Optimization.Operators;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Fossil;
 using HeuristicLab.PluginInfrastructure;
 
@@ -37 +37 @@
   [Item("Linear Assignment Problem (LAP)", "In the linear assignment problem (LAP) an assignment of workers to jobs has to be found such that each worker is assigned to exactly one job, each job is assigned to exactly one worker and the sum of the resulting costs is minimal (or maximal).")]
   [Creatable(CreatableAttribute.Categories.CombinatorialProblems, Priority = 130)]
-  [StorableClass]
+  [StorableType("7766E004-A93D-4CA6-8012-AE5E8F4C4D85")]
   public sealed class LinearAssignmentProblem : SingleObjectiveHeuristicOptimizationProblem<ILAPEvaluator, IPermutationCreator>, IStorableContent {
     public static readonly string CostsDescription = "The cost matrix that describes the assignment of rows to columns.";
@@ -94 +94 @@
 
     [StorableConstructor]
-    private LinearAssignmentProblem(bool deserializing) : base(deserializing) { }
+    private LinearAssignmentProblem(StorableConstructorFlag _) : base(_) { }
     private LinearAssignmentProblem(LinearAssignmentProblem original, Cloner cloner)
       : base(original, cloner) {

branches/2520_PersistenceReintegration/HeuristicLab.Problems.LinearAssignment/3.3/LinearAssignmentProblemSolver.cs

@@ -27 +27 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HEAL.Fossil;
 
 namespace HeuristicLab.Problems.LinearAssignment {
   [Item("LinearAssignmentProblemSolver", "Uses the hungarian algorithm to solve linear assignment problems.")]
-  [StorableClass]
+  [StorableType("ABF202CC-44E4-4208-9EBF-1A104806358F")]
   public sealed class LinearAssignmentProblemSolver : SingleSuccessorOperator, ISingleObjectiveOperator {
     private const int UNASSIGNED = -1;
@@ -49 +49 @@
 
     [StorableConstructor]
-    private LinearAssignmentProblemSolver(bool deserializing) : base(deserializing) { }
+    private LinearAssignmentProblemSolver(StorableConstructorFlag _) : base(_) { }
     private LinearAssignmentProblemSolver(LinearAssignmentProblemSolver original, Cloner cloner) : base(original, cloner) { }
     public LinearAssignmentProblemSolver()