Changeset 16834 for branches/2864_PermutationProblems/HeuristicLab.Problems.PermutationProblems/3.3

Timestamp:

04/19/19 09:41:25 (5 years ago)

Author:

fholzing

Message:

#2864: Made the branch compile again (References, new Persistence, ...)

Location:

branches/2864_PermutationProblems/HeuristicLab.Problems.PermutationProblems/3.3

Files:

• HeuristicLab.Problems.PermutationProblems-3.3.csproj (modified) (3 diffs)
• LinearOrderingProblem.cs (modified) (6 diffs)
• PermutationFlowshopSchedulingProblem.cs (modified) (4 diffs)
• Plugin.cs (modified) (1 diff)
• Properties/AssemblyInfo.cs (modified) (1 diff)

branches/2864_PermutationProblems/HeuristicLab.Problems.PermutationProblems/3.3/HeuristicLab.Problems.PermutationProblems-3.3.csproj

@@ -10 +10 @@
     <RootNamespace>HeuristicLab.Problems.PermutationProblems</RootNamespace>
     <AssemblyName>HeuristicLab.Problems.PermutationProblems-3.3</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
@@ -38 +38 @@
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\trunk\bin\HEAL.Attic.dll</HintPath>
+    </Reference>
     <Reference Include="HeuristicLab.Collections-3.3">
       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath>
@@ -104 +108 @@
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

branches/2864_PermutationProblems/HeuristicLab.Problems.PermutationProblems/3.3/LinearOrderingProblem.cs

@@ -22 +22 @@
 using System;
 using System.Linq;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -28 +29 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Problems.Instances;
 
@@ -34 +34 @@
   [Item("Linear Ordering Problem (LOP)", "Represents a Linear Ordering Problem")]
   [Creatable(CreatableAttribute.Categories.CombinatorialProblems)]
-  [StorableClass]
+  [StorableType("A84D3AAE-8AD2-4502-ACD3-70E62F12841B")]
   public sealed class LinearOrderingProblem : SingleObjectiveBasicProblem<PermutationEncoding>, IProblemInstanceConsumer<LOPData>, IProblemInstanceExporter<LOPData>, IStorableContent {
     private static readonly LOPData DefaultInstance = new LOPData() {
@@ -48 +48 @@
     };
 
-    public OptionalValueParameter<Permutation> BestKnownSolutionParameter
-    {
+    public OptionalValueParameter<Permutation> BestKnownSolutionParameter {
       get { return (OptionalValueParameter<Permutation>)Parameters["BestKnownSolution"]; }
     }
-    public Permutation BestKnownSolution
-    {
+    public Permutation BestKnownSolution {
       get { return BestKnownSolutionParameter.Value; }
-      set
-      {
+      set {
         BestKnownSolutionParameter.Value = value;
       }
     }
-
-    public ValueParameter<DoubleMatrix> MatrixParameter
-    {
+    public ValueParameter<DoubleMatrix> MatrixParameter {
       get { return (ValueParameter<DoubleMatrix>)Parameters["Matrix"]; }
     }
-    public DoubleMatrix Matrix
-    {
+    public DoubleMatrix Matrix {
       get { return MatrixParameter.Value; }
       set { MatrixParameter.Value = value; }
@@ -74 +68 @@
 
     [StorableConstructor]
-    private LinearOrderingProblem(bool deserializing) : base(deserializing) { }
+    private LinearOrderingProblem(StorableConstructorFlag _) : base(_) { }
     private LinearOrderingProblem(LinearOrderingProblem original, Cloner cloner) : base(original, cloner) { }
     public LinearOrderingProblem() {
@@ -112 +106 @@
       }
     }
-
     public LOPData Export() {
       var result = new LOPData {

branches/2864_PermutationProblems/HeuristicLab.Problems.PermutationProblems/3.3/PermutationFlowshopSchedulingProblem.cs

@@ -22 +22 @@
 using System;
 using System.Linq;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -28 +29 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Problems.Instances;
-
 
 namespace HeuristicLab.Problems.PermutationProblems {
   [Item("Permutation Flowshop Scheduling Problem (PFSP)", "Represents a Permutation Flowshop Scheduling Problem")]
   [Creatable(CreatableAttribute.Categories.CombinatorialProblems)]
-  [StorableClass]
+  [StorableType("18A7BE3A-5605-493D-A457-12D8B340F489")]
   public sealed class PermutationFlowshopSchedulingProblem : SingleObjectiveBasicProblem<PermutationEncoding>, IProblemInstanceConsumer<FSSPData>, IProblemInstanceExporter<FSSPData> {
     #region Fields
@@ -55 +54 @@
 
     #region Getter/Setter
-    public OptionalValueParameter<Permutation> BestKnownSolutionParameter
-    {
+    public OptionalValueParameter<Permutation> BestKnownSolutionParameter {
       get { return (OptionalValueParameter<Permutation>)Parameters["BestKnownSolution"]; }
     }
-    public OptionalValueParameter<DoubleMatrix> JobMatrixParameter
-    {
+    public OptionalValueParameter<DoubleMatrix> JobMatrixParameter {
       get { return (OptionalValueParameter<DoubleMatrix>)Parameters["JobMatrix"]; }
     }
-    public Permutation BestKnownSolution
-    {
+    public Permutation BestKnownSolution {
       get { return BestKnownSolutionParameter.Value; }
-      set
-      {
+      set {
         BestKnownSolutionParameter.Value = value;
         if (BestKnownSolutionChanged != null) { OnBestKnownSolutionChanged(); }
       }
     }
-    public DoubleMatrix JobMatrix
-    {
+    public DoubleMatrix JobMatrix {
       get { return JobMatrixParameter.Value; }
       set { JobMatrixParameter.Value = value; }
@@ -83 +77 @@
     #region Ctor
     [StorableConstructor]
-    private PermutationFlowshopSchedulingProblem(bool deserializing) : base(deserializing) { }
+    private PermutationFlowshopSchedulingProblem(StorableConstructorFlag _) : base(_) { }
+
     private PermutationFlowshopSchedulingProblem(PermutationFlowshopSchedulingProblem original, Cloner cloner) : base(original, cloner) { }
     public PermutationFlowshopSchedulingProblem() {

branches/2864_PermutationProblems/HeuristicLab.Problems.PermutationProblems/3.3/Plugin.cs

@@ -22 +22 @@
 using HeuristicLab.PluginInfrastructure;
 
-namespace HeuristicLab.Problems.PermutationProblems {
-  [Plugin("HeuristicLab.Problems.PermutationProblems", "3.3.15.16003")]
+namespace HeuristicLab.Problems.PermutationProblems
+{
+  [Plugin("HeuristicLab.Problems.PermutationProblems", "3.3.15.16014")]
   [PluginFile("HeuristicLab.Problems.PermutationProblems-3.3.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Collections", "3.3")]

branches/2864_PermutationProblems/HeuristicLab.Problems.PermutationProblems/3.3/Properties/AssemblyInfo.cs

@@ -54 +54 @@
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("3.3.0.0")]
-[assembly: AssemblyFileVersion("3.3.15.16007")]
+[assembly: AssemblyFileVersion("3.3.15.16014")]