Changeset 16728 for branches/1614_GeneralizedQAP/HeuristicLab.Algorithms.GRASP/3.3

Timestamp:

03/31/19 14:40:15 (5 years ago)

Author:

abeham

Message:

#1614: updated to new persistence and .NET 4.6.1

• merged changes in #3000
• merged changes in #2936

Location:

branches/1614_GeneralizedQAP/HeuristicLab.Algorithms.GRASP/3.3

Files:

• GRASPWithPathRelinking.cs (modified) (3 diffs)
• GRASPWithPathRelinkingMainLoop.cs (modified) (3 diffs)
• HeuristicLab.Algorithms.GRASP-3.3.csproj (modified) (3 diffs)

branches/1614_GeneralizedQAP/HeuristicLab.Algorithms.GRASP/3.3/GRASPWithPathRelinking.cs

@@ -33 +33 @@
 using HeuristicLab.PluginInfrastructure;
 using HeuristicLab.Random;
+using HEAL.Attic;
 
 namespace HeuristicLab.Algorithms.GRASP {
@@ -40 +41 @@
   [Item("GRASP+PR", "The algorithm combines the Greedy Randomized Adaptive Search Procedure (GRASP) with Path Relinking and is described in Mateus, G., Resende, M., and Silva, R. 2011. GRASP with path-relinking for the generalized quadratic assignment problem. Journal of Heuristics 17, Springer Netherlands, pp. 527-565.")]
   [Creatable(CreatableAttribute.Categories.PopulationBasedAlgorithms)]
-  [StorableClass]
+  [StorableType("AA509A09-10A7-48B9-AEF1-50997F01A0B0")]
   public sealed class GRASPWithPathRelinking : HeuristicOptimizationEngineAlgorithm, IStorableContent {
     public string Filename { get; set; }
@@ -133 +134 @@
 
     [StorableConstructor]
-    private GRASPWithPathRelinking(bool deserializing) : base(deserializing) { }
+    private GRASPWithPathRelinking(StorableConstructorFlag _) : base(_) { }
     private GRASPWithPathRelinking(GRASPWithPathRelinking original, Cloner cloner)
       : base(original, cloner) {

branches/1614_GeneralizedQAP/HeuristicLab.Algorithms.GRASP/3.3/GRASPWithPathRelinkingMainLoop.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Linq;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -30 +31 @@
 using HeuristicLab.Optimization.Operators;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Selection;
 
 namespace HeuristicLab.Algorithms.GRASP {
   [Item("GRASP+PR MainLoop", "The main loop that implements the behavior of the GRASP+PR algorithm.")]
-  [StorableClass]
+  [StorableType("14AD672E-ADC2-4506-87A8-5022C2832DF6")]
   public class GRASPWithPathRelinkingMainLoop : AlgorithmOperator {
     public IValueLookupParameter<IntValue> IterationsParameter {
@@ -72 +72 @@
 
     [StorableConstructor]
-    protected GRASPWithPathRelinkingMainLoop(bool deserializing) : base(deserializing) { }
+    protected GRASPWithPathRelinkingMainLoop(StorableConstructorFlag _) : base(_) { }
     protected GRASPWithPathRelinkingMainLoop(GRASPWithPathRelinkingMainLoop original, Cloner cloner)
       : base(original, cloner) { }

branches/1614_GeneralizedQAP/HeuristicLab.Algorithms.GRASP/3.3/HeuristicLab.Algorithms.GRASP-3.3.csproj

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -11 +11 @@
     <RootNamespace>HeuristicLab.Algorithms.GRASP</RootNamespace>
     <AssemblyName>HeuristicLab.Algorithms.GRASP-3.3</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
@@ -41 +41 @@
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec">
+      <Private>False</Private>
+    </Reference>
     <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0">
       <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Collections-3.3.dll</HintPath>