Changeset 16712 for branches/2936_GQAPIntegration
- Timestamp:
- 03/25/19 17:26:02 (6 years ago)
- Location:
- branches/2936_GQAPIntegration
- Files:
-
- 73 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/GRASP/GRASP.cs
r16077 r16712 30 30 using HeuristicLab.Parameters; 31 31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 32 using HEAL.Attic; 32 33 33 34 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms { … … 41 42 [Item("GRASP+PR (GQAP)", "The algorithm implements the Greedy Randomized Adaptive Search Procedure (GRASP) with Path Relinking as 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.")] 42 43 [Creatable(CreatableAttribute.Categories.PopulationBasedAlgorithms)] 43 [Storable Class]44 [StorableType("1FF6B7FC-58CA-4F89-BCAF-31CFC0B0546C")] 44 45 public sealed class GRASP : StochasticAlgorithm<GRASPContext, IntegerVectorEncoding> { 45 46 … … 123 124 124 125 [StorableConstructor] 125 private GRASP( bool deserializing) : base(deserializing) { }126 private GRASP(StorableConstructorFlag _) : base(_) { } 126 127 private GRASP(GRASP original, Cloner cloner) 127 128 : base(original, cloner) { -
branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/GRASP/GRASPContext.cs
r16077 r16712 25 25 using HeuristicLab.Parameters; 26 26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 27 using HEAL.Attic; 27 28 28 29 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms { 29 30 [Item("GRASP+PR (GQAP) Context", "Context for GRASP+PR (GQAP).")] 30 [Storable Class]31 [StorableType("40C0A979-FFDB-43E0-89A0-6553BD3EB9DB")] 31 32 public sealed class GRASPContext : PopulationContext<ISingleObjectiveSolutionScope<GQAPSolution>> { 32 33 … … 50 51 51 52 [StorableConstructor] 52 private GRASPContext( bool deserializing) : base(deserializing) { }53 private GRASPContext(StorableConstructorFlag _) : base(_) { } 53 54 private GRASPContext(GRASPContext original, Cloner cloner) 54 55 : base(original, cloner) { -
branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms-3.3.csproj
r16077 r16712 10 10 <RootNamespace>HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms</RootNamespace> 11 11 <AssemblyName>HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms-3.3</AssemblyName> 12 <TargetFrameworkVersion>v4. 5</TargetFrameworkVersion>12 <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> 13 13 <FileAlignment>512</FileAlignment> 14 14 <TargetFrameworkProfile /> … … 42 42 </PropertyGroup> 43 43 <ItemGroup> 44 <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL"> 45 <SpecificVersion>False</SpecificVersion> 46 <HintPath>..\..\..\..\trunk\bin\HEAL.Attic.dll</HintPath> 47 <Private>False</Private> 48 </Reference> 44 49 <Reference Include="HeuristicLab.Analysis-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL"> 45 50 <SpecificVersion>False</SpecificVersion> -
branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/Infrastructure/Algorithms/ContextAlgorithm.cs
r15718 r16712 31 31 using HeuristicLab.Parameters; 32 32 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 33 using HEAL.Attic; 33 34 34 35 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms { 35 36 [Item("Context-based Algorithm", "Algorithms that make use of contexts to facilitate applying operators.")] 36 [Storable Class]37 [StorableType("F4D85B12-B512-4CC5-B220-69C01E2C8DBB")] 37 38 public abstract class ContextAlgorithm<TContext, TEncoding> : BasicAlgorithm 38 39 where TContext : class, IContext, new() … … 110 111 111 112 [StorableConstructor] 112 protected ContextAlgorithm( bool deserializing) : base(deserializing) { }113 protected ContextAlgorithm(StorableConstructorFlag _) : base(_) { } 113 114 protected ContextAlgorithm(ContextAlgorithm<TContext, TEncoding> original, Cloner cloner) 114 115 : base(original, cloner) { -
branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/Infrastructure/Algorithms/StochasticAlgorithm.cs
r15572 r16712 28 28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 29 29 using HeuristicLab.Random; 30 using HEAL.Attic; 30 31 31 32 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms { 32 33 [Item("Stochastic Algorithm", "Stochastic context-based algorithms to facilitate applying operators.")] 33 [Storable Class]34 [StorableType("75B72520-ECBC-42F7-8560-448940825847")] 34 35 public abstract class StochasticAlgorithm<TContext, TEncoding> : ContextAlgorithm<TContext, TEncoding> 35 36 where TContext : class, IStochasticContext, new() … … 57 58 58 59 [StorableConstructor] 59 protected StochasticAlgorithm( bool deserializing) : base(deserializing) { }60 protected StochasticAlgorithm(StorableConstructorFlag _) : base(_) { } 60 61 protected StochasticAlgorithm(StochasticAlgorithm<TContext, TEncoding> original, Cloner cloner) 61 62 : base(original, cloner) { -
branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/Infrastructure/Contexts/BasicContext.cs
r15700 r16712 28 28 using HeuristicLab.Parameters; 29 29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 30 using HEAL.Attic; 30 31 31 32 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms { 32 33 [Item("Basic Context", "A base class for algorithms' contexts.")] 33 [Storable Class]34 [StorableType("32A031BB-19B1-4792-B3C0-673FF52A75E1")] 34 35 public class BasicContext : ParameterizedNamedItem, IContext { 35 36 … … 77 78 78 79 [StorableConstructor] 79 protected BasicContext( bool deserializing) : base(deserializing) { }80 protected BasicContext(StorableConstructorFlag _) : base(_) { } 80 81 protected BasicContext(BasicContext original, Cloner cloner) 81 82 : base(original, cloner) { -
branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/Infrastructure/Contexts/PopulationContext.cs
r15616 r16712 25 25 using HeuristicLab.Core; 26 26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 27 using HEAL.Attic; 27 28 28 29 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms { 29 30 [Item("Population Context", "A context for population-based algorithms.")] 30 [Storable Class]31 [StorableType("328AF409-9ECE-4E59-A842-ABBD98CBE386")] 31 32 public abstract class PopulationContext<TSolutionScope> : StochasticContext 32 33 where TSolutionScope: class, IScope { … … 56 57 57 58 [StorableConstructor] 58 protected PopulationContext( bool deserializing) : base(deserializing) { }59 protected PopulationContext(StorableConstructorFlag _) : base(_) { } 59 60 protected PopulationContext(PopulationContext<TSolutionScope> original, Cloner cloner) 60 61 : base(original, cloner) { -
branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/Infrastructure/Contexts/SingleSolutionContext.cs
r15616 r16712 23 23 using HeuristicLab.Core; 24 24 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 25 using HEAL.Attic; 25 26 26 27 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms { 27 28 [Item("Single Solution Context", "A context for single solution algorithms.")] 28 [Storable Class]29 [StorableType("C894BD11-05CE-44E2-B25D-606071B78757")] 29 30 public abstract class SingleSolutionContext<TSolutionScope> : StochasticContext 30 31 where TSolutionScope: class, IScope { … … 44 45 45 46 [StorableConstructor] 46 protected SingleSolutionContext( bool deserializing) : base(deserializing) { }47 protected SingleSolutionContext(StorableConstructorFlag _) : base(_) { } 47 48 protected SingleSolutionContext(SingleSolutionContext<TSolutionScope> original, Cloner cloner) 48 49 : base(original, cloner) { -
branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/Infrastructure/Contexts/StochasticContext.cs
r15616 r16712 24 24 using HeuristicLab.Parameters; 25 25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 26 using HEAL.Attic; 26 27 27 28 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms { 28 29 [Item("Stochastic Context", "A base class for stochastic algorithms' contexts.")] 29 [Storable Class]30 [StorableType("AF5AA1FB-F4C2-450C-A760-C7B1EDBAFCB7")] 30 31 public class StochasticContext : BasicContext, IStochasticContext { 31 32 … … 38 39 39 40 [StorableConstructor] 40 protected StochasticContext( bool deserializing) : base(deserializing) { }41 protected StochasticContext(StorableConstructorFlag _) : base(_) { } 41 42 protected StochasticContext(StochasticContext original, Cloner cloner) 42 43 : base(original, cloner) { -
branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/Infrastructure/Interfaces.cs
r15700 r16712 22 22 using System; 23 23 using HeuristicLab.Core; 24 using HEAL.Attic; 24 25 25 26 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms { 27 [StorableType("8AE6AC8A-7F9A-44C7-911A-4E618D1CC928")] 26 28 public interface ISingleObjectiveSolutionScope<TSolution> : IScope { 27 29 TSolution Solution { get; set; } … … 29 31 } 30 32 33 [StorableType("F007BD11-9CF1-418E-A113-BA68EFD0BC73")] 31 34 public interface IContext : IExecutionContext { 32 35 new IExecutionContext Parent { get; set; } … … 38 41 } 39 42 43 [StorableType("5723FC2A-39F7-4C7D-88D8-944C347B52D8")] 40 44 public interface IStochasticContext : IContext { 41 45 IRandom Random { get; set; } -
branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/Infrastructure/SingleObjectiveSolutionScope.cs
r15572 r16712 25 25 using HeuristicLab.Core; 26 26 using HeuristicLab.Data; 27 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;27 using HEAL.Attic; 28 28 29 29 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms { 30 30 [Item("Solution Scope", "Scope for an individual/solution of a single-objective single-encoded problem.")] 31 [Storable Class]31 [StorableType("C9026A26-C121-4F2E-88F8-2AA1ABF4D142")] 32 32 public sealed class SingleObjectiveSolutionScope<T> : NamedItem, ISingleObjectiveSolutionScope<T> where T : class, IItem { 33 33 public new static Image StaticItemImage { … … 73 73 74 74 [StorableConstructor] 75 private SingleObjectiveSolutionScope( bool deserializing) : base(deserializing) { }75 private SingleObjectiveSolutionScope(StorableConstructorFlag _) : base(_) { } 76 76 private SingleObjectiveSolutionScope(SingleObjectiveSolutionScope<T> original, Cloner cloner) 77 77 : base(original, cloner) { -
branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/Plugin.cs
r16077 r16712 23 23 24 24 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms { 25 [Plugin("HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms", "3.3.15.1 5890")]25 [Plugin("HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms", "3.3.15.16077")] 26 26 [PluginFile("HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms-3.3.dll", PluginFileType.Assembly)] 27 [PluginDependency("HeuristicLab.Attic", "1.0")] 27 28 [PluginDependency("HeuristicLab.Analysis", "3.3")] 28 29 [PluginDependency("HeuristicLab.Collections", "3.3")] -
branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/Plugin.cs.frame
r16077 r16712 25 25 [Plugin("HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms", "3.3.15.$WCREV$")] 26 26 [PluginFile("HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms-3.3.dll", PluginFileType.Assembly)] 27 [PluginDependency("HeuristicLab.Attic", "1.0")] 27 28 [PluginDependency("HeuristicLab.Analysis", "3.3")] 28 29 [PluginDependency("HeuristicLab.Collections", "3.3")] -
branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms/3.3/Properties/AssemblyInfo.cs
r16077 r16712 54 54 // [assembly: AssemblyVersion("1.0.*")] 55 55 [assembly: AssemblyVersion("3.3.0.0")] 56 [assembly: AssemblyFileVersion("3.3.15.1 5890")]56 [assembly: AssemblyFileVersion("3.3.15.16077")] -
branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Instances/3.3/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Instances-3.3.csproj
r15688 r16712 10 10 <RootNamespace>HeuristicLab.Problems.GeneralizedQuadraticAssignment.Instances</RootNamespace> 11 11 <AssemblyName>HeuristicLab.Problems.GeneralizedQuadraticAssignment.Instances-3.3</AssemblyName> 12 <TargetFrameworkVersion>v4. 5</TargetFrameworkVersion>12 <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> 13 13 <FileAlignment>512</FileAlignment> 14 14 <TargetFrameworkProfile /> -
branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Instances/3.3/Plugin.cs
r16077 r16712 23 23 24 24 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Instances { 25 [Plugin("HeuristicLab.Problems.GeneralizedQuadraticAssignment.Instances", "3.3.15.1 5905")]25 [Plugin("HeuristicLab.Problems.GeneralizedQuadraticAssignment.Instances", "3.3.15.16077")] 26 26 [PluginFile("HeuristicLab.Problems.GeneralizedQuadraticAssignment.Instances-3.3.dll", PluginFileType.Assembly)] 27 27 [PluginDependency("HeuristicLab.Common", "3.3")] -
branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Instances/3.3/Properties/AssemblyInfo.cs
r16077 r16712 53 53 // [assembly: AssemblyVersion("1.0.*")] 54 54 [assembly: AssemblyVersion("3.3.0.0")] 55 [assembly: AssemblyFileVersion("3.3.15.1 5905")]55 [assembly: AssemblyFileVersion("3.3.15.16077")] -
branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views/3.3/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views-3.3.csproj
r16077 r16712 1 1 <?xml version="1.0" encoding="utf-8"?> 2 <Project ToolsVersion=" 4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">2 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 3 3 <PropertyGroup> 4 4 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> … … 11 11 <RootNamespace>HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views</RootNamespace> 12 12 <AssemblyName>HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views-3.3</AssemblyName> 13 <TargetFrameworkVersion>v4. 5</TargetFrameworkVersion>13 <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> 14 14 <FileAlignment>512</FileAlignment> 15 15 <TargetFrameworkProfile /> -
branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Evaluation/Evaluation.cs
r16077 r16712 25 25 using HeuristicLab.Core; 26 26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 27 using HEAL.Attic; 27 28 28 29 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment { 29 30 [Item("GQAP Evaluation", "Class that contains the results of evaluating a solution to the GQAP.")] 30 [Storable Class]31 [StorableType("765222A4-9184-42FF-9413-886BC9B2EF03")] 31 32 public class Evaluation : Item { 32 33 … … 64 65 65 66 [StorableConstructor] 66 protected Evaluation( bool deserializing) : base(deserializing) { }67 protected Evaluation(StorableConstructorFlag _) : base(_) { } 67 68 protected Evaluation(Evaluation original, Cloner cloner) 68 69 : base(original, cloner) { -
branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Evaluation/GQAPNMoveEvaluator.cs
r16077 r16712 29 29 using HeuristicLab.Parameters; 30 30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 31 using HEAL.Attic; 31 32 32 33 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment { 33 34 [Item("N-Move Evaluator", "Evaluates an N-Move.")] 34 [Storable Class]35 [StorableType("EB4CCB5D-8FAC-4DFD-944E-1AC418AAE091")] 35 36 public class GQAPNMoveEvaluator : SingleSuccessorOperator, IGQAPNMoveEvaluator, 36 37 IQualityAwareGQAPOperator, IProblemInstanceAwareGQAPOperator, IAssignmentAwareGQAPOperator { … … 66 67 67 68 [StorableConstructor] 68 protected GQAPNMoveEvaluator( bool deserializing) : base(deserializing) { }69 protected GQAPNMoveEvaluator(StorableConstructorFlag _) : base(_) { } 69 70 protected GQAPNMoveEvaluator(GQAPNMoveEvaluator original, Cloner cloner) : base(original, cloner) { } 70 71 public GQAPNMoveEvaluator() -
branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/GQAP.cs
r16077 r16712 34 34 using HeuristicLab.PluginInfrastructure; 35 35 using HeuristicLab.Problems.Instances; 36 using HEAL.Attic; 36 37 37 38 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment { 38 39 [Item("Generalized Quadratic Assignment Problem (GQAP)", "The Generalized Quadratic Assignment Problem (GQAP) is a generalization of the QAP in that it allows to assign multiple facilities (here called equipment) to a single location. The problem is described in Lee, C.G., and Ma, Z. 2003. The Generalized Quadratic Assignment Problem. Technical Report M5S 3G8, University of Toronto, Canada.")] 39 40 [Creatable(CreatableAttribute.Categories.CombinatorialProblems)] 40 [Storable Class]41 [StorableType("20DC9B2F-F667-425E-A235-B0192CCB1BF4")] 41 42 public sealed class GQAP : SingleObjectiveBasicProblem<IntegerVectorEncoding>, 42 43 IProblemInstanceConsumer<QAPData>, … … 87 88 88 89 [StorableConstructor] 89 private GQAP( bool deserializing) : base(deserializing) { }90 private GQAP(StorableConstructorFlag _) : base(_) { } 90 91 private GQAP(GQAP original, Cloner cloner) 91 92 : base(original, cloner) { -
branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/GQAPAssignment.cs
r16077 r16712 25 25 using HeuristicLab.Encodings.IntegerVectorEncoding; 26 26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 27 using HEAL.Attic; 27 28 28 29 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment { 29 30 [Item("Generalized QAP Assignment", "Represents the solution as well as the problem parameters of a GQAP instance.")] 30 [Storable Class]31 [StorableType("8DAC9356-54EE-4EDC-9AB4-0DA47F111920")] 31 32 public sealed class GQAPAssignment : Item, INotifyPropertyChanged { 32 33 … … 54 55 55 56 [StorableConstructor] 56 private GQAPAssignment( bool deserializing) : base(deserializing) { }57 private GQAPAssignment(StorableConstructorFlag _) : base(_) { } 57 58 private GQAPAssignment(GQAPAssignment original, Cloner cloner) 58 59 : base(original, cloner) { -
branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/GQAPAssignmentArchive.cs
r16077 r16712 24 24 using HeuristicLab.Core; 25 25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 26 using HEAL.Attic; 26 27 27 28 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment { 28 29 [Item("GQAPAssignmentArchive", "Stores the pareto front of assignments.")] 29 [Storable Class]30 [StorableType("EA3C4BB4-322B-47EB-8A04-95DADA3D2C02")] 30 31 public sealed class GQAPAssignmentArchive : Item, INotifyPropertyChanged { 31 32 … … 53 54 54 55 [StorableConstructor] 55 private GQAPAssignmentArchive( bool deserializing) : base(deserializing) { }56 private GQAPAssignmentArchive(StorableConstructorFlag _) : base(_) { } 56 57 private GQAPAssignmentArchive(GQAPAssignmentArchive original, Cloner cloner) 57 58 : base(original, cloner) { -
branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/GQAPInstance.cs
r16077 r16712 27 27 using HeuristicLab.Parameters; 28 28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 29 using HEAL.Attic; 29 30 30 31 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment { 31 32 [Item("GQAP Instance", "Instance of a generalized quadratic assignment problem.")] 32 [Storable Class]33 [StorableType("54208525-4EF6-404F-AF4A-52927104C563")] 33 34 public class GQAPInstance : ParameterizedNamedItem { 34 35 public static readonly string WeightsDescription = "The weights matrix describes the flows between the equipments."; … … 131 132 132 133 [StorableConstructor] 133 protected GQAPInstance( bool deserializing) : base(deserializing) { }134 protected GQAPInstance(StorableConstructorFlag _) : base(_) { } 134 135 protected GQAPInstance(GQAPInstance original, Cloner cloner) 135 136 : base(original, cloner) { -
branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/GQAPSolution.cs
r16077 r16712 25 25 using HeuristicLab.Encodings.IntegerVectorEncoding; 26 26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 27 using HEAL.Attic; 27 28 28 29 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment { 29 30 [Item("GQAPSolution", "A solution to the Generalized Quadratic Assignment Problem.")] 30 [Storable Class]31 [StorableType("D4CC7924-87BF-4499-9149-D18000AD8151")] 31 32 public class GQAPSolution : Item, INotifyPropertyChanged { 32 33 … … 54 55 55 56 [StorableConstructor] 56 protected GQAPSolution( bool deserializing) : base(deserializing) { }57 protected GQAPSolution(StorableConstructorFlag _) : base(_) { } 57 58 protected GQAPSolution(GQAPSolution original, Cloner cloner) 58 59 : base(original, cloner) { -
branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/HeuristicLab.Problems.GeneralizedQuadraticAssignment-3.3.csproj
r16077 r16712 1 1 <?xml version="1.0" encoding="utf-8"?> 2 <Project ToolsVersion=" 4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">2 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 3 3 <PropertyGroup> 4 4 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> … … 11 11 <RootNamespace>HeuristicLab.Problems.GeneralizedQuadraticAssignment</RootNamespace> 12 12 <AssemblyName>HeuristicLab.Problems.GeneralizedQuadraticAssignment-3.3</AssemblyName> 13 <TargetFrameworkVersion>v4. 5</TargetFrameworkVersion>13 <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> 14 14 <FileAlignment>512</FileAlignment> 15 15 <TargetFrameworkProfile /> … … 41 41 </PropertyGroup> 42 42 <ItemGroup> 43 <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL"> 44 <SpecificVersion>False</SpecificVersion> 45 <HintPath>..\..\..\..\trunk\bin\HEAL.Attic.dll</HintPath> 46 <Private>False</Private> 47 </Reference> 43 48 <Reference Include="HeuristicLab.Analysis-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL"> 44 49 <SpecificVersion>False</SpecificVersion> -
branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/Operator/IGQAPCrossover.cs
r16077 r16712 23 23 using HeuristicLab.Encodings.IntegerVectorEncoding; 24 24 using HeuristicLab.Optimization; 25 using HEAL.Attic; 25 26 26 27 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment { 28 [StorableType("E2FD76F9-82CC-466A-AB42-5B31F02D45FC")] 27 29 public interface IGQAPCrossover : IGQAPOperator, ICrossover { 28 30 IScopeTreeLookupParameter<IntegerVector> ParentsParameter { get; } -
branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/Operator/IGQAPLocalImprovementOperator.cs
r16077 r16712 23 23 using HeuristicLab.Encodings.IntegerVectorEncoding; 24 24 using HeuristicLab.Optimization; 25 using HEAL.Attic; 25 26 26 27 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment { 28 [StorableType("D22AA954-0957-4F71-9D3C-A614F53A4821")] 27 29 public interface IGQAPLocalImprovementOperator : ILocalImprovementAlgorithmOperator { 28 30 ILookupParameter<IntegerVector> AssignmentParameter { get; } -
branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/Operator/IGQAPManipulator.cs
r16077 r16712 23 23 using HeuristicLab.Encodings.IntegerVectorEncoding; 24 24 using HeuristicLab.Optimization; 25 using HEAL.Attic; 25 26 26 27 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment { 28 [StorableType("A3C58BBD-1652-456B-AF71-D58F782A47D6")] 27 29 public interface IGQAPManipulator : IManipulator { 28 30 ILookupParameter<IntegerVector> AssignmentParameter { get; } -
branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/Operator/IGQAPMoveEvaluator.cs
r16077 r16712 22 22 using HeuristicLab.Core; 23 23 using HeuristicLab.Optimization; 24 using HEAL.Attic; 24 25 25 26 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment { 27 [StorableType("8DE86FE9-07B9-4550-B36C-4DC6B2F58272")] 26 28 public interface IGQAPMoveEvaluator : IGQAPMoveOperator, ISingleObjectiveMoveEvaluator { 27 29 ILookupParameter<Evaluation> MoveEvaluationParameter { get; } -
branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/Operator/IGQAPMoveOperator.cs
r16077 r16712 23 23 using HeuristicLab.Encodings.IntegerVectorEncoding; 24 24 using HeuristicLab.Optimization; 25 using HEAL.Attic; 25 26 26 27 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment { 28 [StorableType("BB1D416A-CFE4-4CEF-875F-905F38861087")] 27 29 public interface IGQAPMoveOperator : IMoveOperator { 28 30 ILookupParameter<IntegerVector> AssignmentParameter { get; } -
branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/Operator/IGQAPNMoveEvaluator.cs
r16077 r16712 1 #region License Information 1 using HEAL.Attic; 2 #region License Information 2 3 /* HeuristicLab 3 4 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) … … 21 22 22 23 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment { 24 [StorableType("ACEEB42B-09AA-432C-98B4-2C6BBF0D38E5")] 23 25 public interface IGQAPNMoveEvaluator : IGQAPMoveEvaluator, IGQAPNMoveOperator { } 24 26 } -
branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/Operator/IGQAPNMoveOperator.cs
r16077 r16712 21 21 22 22 using HeuristicLab.Core; 23 using HEAL.Attic; 23 24 24 25 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment { 26 [StorableType("4128D4FF-A36C-4D3F-ADE1-B63407D5C7DE")] 25 27 public interface IGQAPNMoveOperator : IGQAPMoveOperator { 26 28 ILookupParameter<NMove> MoveParameter { get; } -
branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/Operator/IGQAPOperator.cs
r16077 r16712 21 21 22 22 using HeuristicLab.Core; 23 using HEAL.Attic; 23 24 24 25 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment { 26 [StorableType("521D5B7F-85A0-4BE9-89B2-CA0C3B5B9338")] 25 27 public interface IGQAPOperator : IOperator { } 26 28 } -
branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/Operator/IGQAPSolutionCreator.cs
r16077 r16712 21 21 22 22 using HeuristicLab.Encodings.IntegerVectorEncoding; 23 using HEAL.Attic; 23 24 24 25 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment { 25 public interface IGQAPSolutionCreator : IIntegerVectorCreator { } 26 [StorableType("02E67D15-F15E-4255-855B-8BA2534E7B2E")] 27 public interface IGQAPSolutionCreator : IIntegerVectorCreator { } 26 28 } -
branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/Parameter/IAssignmentAwareGQAPOperator.cs
r16077 r16712 22 22 using HeuristicLab.Core; 23 23 using HeuristicLab.Encodings.IntegerVectorEncoding; 24 using HEAL.Attic; 24 25 25 26 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment { 27 [StorableType("1A005153-0B2E-4C8F-993A-F7B03438A359")] 26 28 public interface IAssignmentAwareGQAPOperator : IGQAPOperator { 27 29 ILookupParameter<IntegerVector> AssignmentParameter { get; } -
branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/Parameter/IBestKnownQualityAwareGQAPOperator.cs
r16077 r16712 22 22 using HeuristicLab.Core; 23 23 using HeuristicLab.Data; 24 using HEAL.Attic; 24 25 25 26 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment { 27 [StorableType("91E65BE8-8BFA-440B-A314-0494E70ED558")] 26 28 public interface IBestKnownQualityAwareGQAPOperator : IGQAPOperator { 27 29 ILookupParameter<DoubleValue> BestKnownQualityParameter { get; } -
branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/Parameter/IBestKnownSolutionAwareGQAPOperator.cs
r16077 r16712 21 21 22 22 using HeuristicLab.Core; 23 using HEAL.Attic; 23 24 24 25 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment { 26 [StorableType("A90653A3-28DB-49AD-A7D5-07F689116BC6")] 25 27 public interface IBestKnownSolutionAwareGQAPOperator : IGQAPOperator { 26 28 ILookupParameter<GQAPAssignment> BestKnownSolutionParameter { get; } -
branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/Parameter/IBestKnownSolutionsAwareGQAPOperator.cs
r16077 r16712 21 21 22 22 using HeuristicLab.Core; 23 using HEAL.Attic; 23 24 24 25 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment { 26 [StorableType("C8CCB98C-2792-427C-9C31-289364C4CFF7")] 25 27 public interface IBestKnownSolutionsAwareGQAPOperator : IGQAPOperator { 26 28 ILookupParameter<GQAPAssignmentArchive> BestKnownSolutionsParameter { get; } -
branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/Parameter/IMoveQualityAwareGQAPOperator.cs
r16077 r16712 22 22 using HeuristicLab.Core; 23 23 using HeuristicLab.Data; 24 using HEAL.Attic; 24 25 25 26 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment { 27 [StorableType("9CFFCC2B-E7AC-4719-ABA8-4FAAD1EE106F")] 26 28 public interface IMoveQualityAwareGQAPOperator : IGQAPMoveOperator { 27 29 ILookupParameter<DoubleValue> MoveQualityParameter { get; } -
branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/Parameter/IProblemInstanceAwareGQAPOperator.cs
r16077 r16712 21 21 22 22 using HeuristicLab.Core; 23 using HEAL.Attic; 23 24 24 25 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment { 26 [StorableType("5780BD3B-C406-4C0E-96E9-52336301FFA2")] 25 27 public interface IProblemInstanceAwareGQAPOperator : IGQAPOperator { 26 28 ILookupParameter<GQAPInstance> ProblemInstanceParameter { get; } -
branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/Parameter/IQualitiesAwareGQAPOperator.cs
r16077 r16712 22 22 using HeuristicLab.Core; 23 23 using HeuristicLab.Data; 24 using HEAL.Attic; 24 25 25 26 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment { 27 [StorableType("94E6E70C-6BF4-4F57-9D2E-8AC7E5716C34")] 26 28 public interface IQualitiesAwareGQAPOperator : IGQAPOperator { 27 29 IScopeTreeLookupParameter<DoubleValue> QualityParameter { get; } -
branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Interfaces/Parameter/IQualityAwareGQAPOperator.cs
r16077 r16712 22 22 using HeuristicLab.Core; 23 23 using HeuristicLab.Data; 24 using HEAL.Attic; 24 25 25 26 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment { 27 [StorableType("903B1E5E-980E-440D-BFEF-C4EC8E3D01B4")] 26 28 public interface IQualityAwareGQAPOperator : IGQAPOperator { 27 29 ILookupParameter<DoubleValue> QualityParameter { get; } -
branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Moves/ExhaustiveOneMoveGenerator.cs
r16077 r16712 29 29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 30 30 using HeuristicLab.Random; 31 using HEAL.Attic; 31 32 32 33 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment { 33 34 [Item("Exhaustive 1-Move MoveGenerator", "Exhaustively generates all possible 1-moves.")] 34 [Storable Class]35 [StorableType("A200C3BE-D761-4F82-9CA9-44A7BB2AB0DD")] 35 36 public class ExhaustiveOneMoveGenerator : GQAPNMoveGenerator, IStochasticOperator, IExhaustiveMoveGenerator { 36 37 … … 40 41 41 42 [StorableConstructor] 42 protected ExhaustiveOneMoveGenerator( bool deserializing) : base(deserializing) { }43 protected ExhaustiveOneMoveGenerator(StorableConstructorFlag _) : base(_) { } 43 44 protected ExhaustiveOneMoveGenerator(ExhaustiveOneMoveGenerator original, Cloner cloner) : base(original, cloner) { } 44 45 public ExhaustiveOneMoveGenerator() -
branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Moves/GQAPMoveGenerator.cs
r16077 r16712 27 27 using HeuristicLab.Parameters; 28 28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 29 using HEAL.Attic; 29 30 30 31 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment { 31 32 [Item("GQAPMoveGenerator", "Base class for move generators for the Generalized Quadratic Assignment Problem.")] 32 [Storable Class]33 [StorableType("4CB9C31B-4ACA-4ED6-8C7E-756319EFB8FF")] 33 34 public abstract class GQAPMoveGenerator : SingleSuccessorOperator, IMoveGenerator, IGQAPMoveOperator, 34 35 IProblemInstanceAwareGQAPOperator { … … 44 45 45 46 [StorableConstructor] 46 protected GQAPMoveGenerator( bool deserializing) : base(deserializing) { }47 protected GQAPMoveGenerator(StorableConstructorFlag _) : base(_) { } 47 48 protected GQAPMoveGenerator(GQAPMoveGenerator original, Cloner cloner) : base(original, cloner) { } 48 49 public GQAPMoveGenerator() -
branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Moves/GQAPNMoveGenerator.cs
r16077 r16712 28 28 using HeuristicLab.Parameters; 29 29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 30 using HEAL.Attic; 30 31 31 32 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment { 32 33 [Item("N-Move Generator", "Base class for move operators that generate N-Move moves.")] 33 [Storable Class]34 [StorableType("AC6F4053-7EEF-4125-A6F7-C93A3DC7001A")] 34 35 public abstract class GQAPNMoveGenerator : GQAPMoveGenerator, IGQAPNMoveOperator { 35 36 … … 46 47 47 48 [StorableConstructor] 48 protected GQAPNMoveGenerator( bool deserializing) : base(deserializing) { }49 protected GQAPNMoveGenerator(StorableConstructorFlag _) : base(_) { } 49 50 protected GQAPNMoveGenerator(GQAPNMoveGenerator original, Cloner cloner) : base(original, cloner) { } 50 51 public GQAPNMoveGenerator() -
branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Moves/NMove.cs
r16077 r16712 25 25 using HeuristicLab.Core; 26 26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 27 using HEAL.Attic; 27 28 28 29 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment { 29 30 [Item("N-Move", "An N-Move describes the relocation of n equipments to n different locations.")] 30 [Storable Class]31 [StorableType("A3E69FD9-B578-486C-81CE-D1CB65A250CE")] 31 32 public class NMove : Item { 32 33 [Storable] … … 56 57 57 58 [StorableConstructor] 58 protected NMove( bool deserializing) : base(deserializing) { }59 protected NMove(StorableConstructorFlag _) : base(_) { } 59 60 protected NMove(NMove original, Cloner cloner) 60 61 : base(original, cloner) { -
branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Moves/NMoveAbsoluteAttribute.cs
r16077 r16712 26 26 using HeuristicLab.Encodings.IntegerVectorEncoding; 27 27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 28 using HEAL.Attic; 28 29 29 30 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment { 30 31 [Item("N-Move Absolute TabuAttribute", "Attribute to determine whether a certain move is tabu.")] 31 [Storable Class]32 [StorableType("39C4AE8F-9FEB-447A-878B-38796B7E8AAF")] 32 33 public class NMoveAbsoluteTabuAttribute : Item { 33 34 … … 38 39 39 40 [StorableConstructor] 40 protected NMoveAbsoluteTabuAttribute( bool deserializing) : base(deserializing) { }41 protected NMoveAbsoluteTabuAttribute(StorableConstructorFlag _) : base(_) { } 41 42 protected NMoveAbsoluteTabuAttribute(NMoveAbsoluteTabuAttribute original, Cloner cloner) : base(original, cloner) { } 42 43 public NMoveAbsoluteTabuAttribute(NMove move, IntegerVector assignment, double moveQuality) -
branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Moves/NMoveMaker.cs
r16077 r16712 28 28 using HeuristicLab.Parameters; 29 29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 30 using HEAL.Attic; 30 31 31 32 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment { 32 33 [Item("N-Move Maker", "Performs an N-Move.")] 33 [Storable Class]34 [StorableType("9DAB4C4D-533A-4990-B591-A4C877F0CCE9")] 34 35 public class NMoveMaker : SingleSuccessorOperator, IQualityAwareGQAPOperator, IMoveQualityAwareGQAPOperator, IGQAPNMoveOperator, IMoveMaker { 35 36 … … 54 55 55 56 [StorableConstructor] 56 protected NMoveMaker( bool deserializing) : base(deserializing) { }57 protected NMoveMaker(StorableConstructorFlag _) : base(_) { } 57 58 protected NMoveMaker(NMoveMaker original, Cloner cloner) : base(original, cloner) { } 58 59 public NMoveMaker() -
branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Moves/NMoveTabuChecker.cs
r16077 r16712 28 28 using HeuristicLab.Parameters; 29 29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 30 using HEAL.Attic; 30 31 31 32 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Moves { 32 33 [Item("N-Move TabuChecker", "Checks if a certain N-Move is tabu.")] 33 [Storable Class]34 [StorableType("8E122154-5BCE-404A-8AD4-6C30912B3E89")] 34 35 public class NMoveTabuChecker : SingleSuccessorOperator, ITabuChecker, 35 36 IGQAPNMoveOperator, IMoveQualityAwareGQAPOperator { … … 68 69 69 70 [StorableConstructor] 70 protected NMoveTabuChecker( bool deserializing) : base(deserializing) { }71 protected NMoveTabuChecker(StorableConstructorFlag _) : base(_) { } 71 72 protected NMoveTabuChecker(NMoveTabuChecker original, Cloner cloner) : base(original, cloner) { } 72 73 public NMoveTabuChecker() -
branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Moves/NMoveTabuMaker.cs
r16077 r16712 26 26 using HeuristicLab.Parameters; 27 27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 28 using HEAL.Attic; 28 29 29 30 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Moves { 30 31 [Item("N-Move TabuMaker", "Declares an N-Move tabu.")] 31 [Storable Class]32 [StorableType("BE81C264-2DD8-4A2C-8796-D0D1E121FF53")] 32 33 public class NMoveTabuMaker : TabuMaker, IGQAPNMoveOperator, IMoveQualityAwareGQAPOperator { 33 34 … … 43 44 44 45 [StorableConstructor] 45 protected NMoveTabuMaker( bool deserializing) : base(deserializing) { }46 protected NMoveTabuMaker(StorableConstructorFlag _) : base(_) { } 46 47 protected NMoveTabuMaker(NMoveTabuMaker original, Cloner cloner) : base(original, cloner) { } 47 48 public NMoveTabuMaker() -
branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Moves/StochasticNMoveMultiMoveGenerator.cs
r16077 r16712 28 28 using HeuristicLab.Parameters; 29 29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 30 using HEAL.Attic; 30 31 31 32 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment { 32 33 [Item("Stochastic N-Move MultiMoveGenerator", "Randomly samples a number of N-Moves.")] 33 [Storable Class]34 [StorableType("EEE53E16-0FB6-4041-A9AC-ECDA5E73A505")] 34 35 public class StochasticNMoveMultiMoveGenerator : GQAPNMoveGenerator, IStochasticOperator, IMultiMoveGenerator { 35 36 … … 42 43 43 44 [StorableConstructor] 44 protected StochasticNMoveMultiMoveGenerator( bool deserializing) : base(deserializing) { }45 protected StochasticNMoveMultiMoveGenerator(StorableConstructorFlag _) : base(_) { } 45 46 protected StochasticNMoveMultiMoveGenerator(StochasticNMoveMultiMoveGenerator original, Cloner cloner) : base(original, cloner) { } 46 47 public StochasticNMoveMultiMoveGenerator() -
branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Moves/StochasticNMoveSingleMoveGenerator.cs
r16077 r16712 31 31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 32 32 using HeuristicLab.Random; 33 using HEAL.Attic; 33 34 34 35 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment { 35 36 [Item("Stochastic N-Move SingleMoveGenerator", "Randomly samples a single N-Move.")] 36 [Storable Class]37 [StorableType("7CC8D0D6-C865-485F-A16A-C2ED764C6AC4")] 37 38 public class StochasticNMoveSingleMoveGenerator : GQAPNMoveGenerator, IStochasticOperator, ISingleMoveGenerator { 38 39 … … 42 43 43 44 [StorableConstructor] 44 protected StochasticNMoveSingleMoveGenerator( bool deserializing) : base(deserializing) { }45 protected StochasticNMoveSingleMoveGenerator(StorableConstructorFlag _) : base(_) { } 45 46 protected StochasticNMoveSingleMoveGenerator(StochasticNMoveSingleMoveGenerator original, Cloner cloner) : base(original, cloner) { } 46 47 public StochasticNMoveSingleMoveGenerator() -
branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/Crossovers/CordeauCrossover.cs
r16077 r16712 29 29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 30 30 using HeuristicLab.Random; 31 using HEAL.Attic; 31 32 32 33 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment { 33 34 [Item("CordeauCrossover", "The merge procedure that is described in Cordeau, J.-F., Gaudioso, M., Laporte, G., Moccia, L. 2006. A memetic heuristic for the generalized quadratic assignment problem. INFORMS Journal on Computing, 18, pp. 433–443.")] 34 [Storable Class]35 [StorableType("05D7FC4C-EF71-4118-9FF1-B8B71B501A99")] 35 36 public class CordeauCrossover : GQAPCrossover, 36 37 IQualitiesAwareGQAPOperator, IProblemInstanceAwareGQAPOperator { … … 47 48 48 49 [StorableConstructor] 49 protected CordeauCrossover( bool deserializing) : base(deserializing) { }50 protected CordeauCrossover(StorableConstructorFlag _) : base(_) { } 50 51 protected CordeauCrossover(CordeauCrossover original, Cloner cloner) 51 52 : base(original, cloner) { -
branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/Crossovers/DiscreteLocationCrossover.cs
r16077 r16712 29 29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 30 30 using HeuristicLab.Random; 31 using HEAL.Attic; 31 32 32 33 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment { 33 34 [Item("DiscreteLocationCrossover", "Combines the assignment to locations from various parents.")] 34 [Storable Class]35 [StorableType("E001CEB3-DAA4-4AF4-843B-2DD951F0EAA6")] 35 36 public class DiscreteLocationCrossover : GQAPCrossover { 36 37 37 38 [StorableConstructor] 38 protected DiscreteLocationCrossover( bool deserializing) : base(deserializing) { }39 protected DiscreteLocationCrossover(StorableConstructorFlag _) : base(_) { } 39 40 protected DiscreteLocationCrossover(DiscreteLocationCrossover original, Cloner cloner) 40 41 : base(original, cloner) { } -
branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/Crossovers/GQAPCrossover.cs
r16077 r16712 27 27 using HeuristicLab.Parameters; 28 28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 29 using HEAL.Attic; 29 30 30 31 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment { 31 32 32 33 [Item("GQAPCrossover", "A base class for operators that cross assignment vectors of the GeneralizedQuadraticAssignment problems.")] 33 [Storable Class]34 [StorableType("DC860DB7-FC00-4374-ADC8-71BB4EDFC6E2")] 34 35 public abstract class GQAPCrossover : SingleSuccessorOperator, IGQAPCrossover, IStochasticOperator { 35 36 public override bool CanChangeName { … … 51 52 52 53 [StorableConstructor] 53 protected GQAPCrossover( bool deserializing) : base(deserializing) { }54 protected GQAPCrossover(StorableConstructorFlag _) : base(_) { } 54 55 protected GQAPCrossover(GQAPCrossover original, Cloner cloner) : base(original, cloner) { } 55 56 protected GQAPCrossover() -
branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/Crossovers/GQAPPathRelinking.cs
r16077 r16712 30 30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 31 31 using HeuristicLab.Random; 32 using HEAL.Attic; 32 33 33 34 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment { … … 36 37 /// </summary> 37 38 [Item("GQAPPathRelinking", "Operator that performs path relinking between two solutions. It 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.")] 38 [Storable Class]39 [StorableType("FAE65A24-AE6D-49DD-8A8C-6574D5304E08")] 39 40 public class GQAPPathRelinking : GQAPCrossover, IQualitiesAwareGQAPOperator { 40 41 … … 53 54 54 55 [StorableConstructor] 55 protected GQAPPathRelinking( bool deserializing) : base(deserializing) { }56 protected GQAPPathRelinking(StorableConstructorFlag _) : base(_) { } 56 57 protected GQAPPathRelinking(GQAPPathRelinking original, Cloner cloner) : base(original, cloner) { } 57 58 public GQAPPathRelinking() -
branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/Crossovers/MultiGQAPCrossover.cs
r16077 r16712 31 31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 32 32 using HeuristicLab.PluginInfrastructure; 33 using HEAL.Attic; 33 34 34 35 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment { 35 36 [Item("MultiGQAPCrossover", "Randomly selects and applies one of its crossovers every time it is called.")] 36 [Storable Class]37 [StorableType("C8AA967E-11CF-48A0-BEC2-71A9ABEB1801")] 37 38 public class MultiGQAPCrossover : StochasticMultiBranch<IGQAPCrossover>, IGQAPCrossover, IProblemInstanceAwareGQAPOperator, IStochasticOperator { 38 39 public override bool CanChangeName { … … 54 55 55 56 [StorableConstructor] 56 protected MultiGQAPCrossover( bool deserializing) : base(deserializing) { }57 protected MultiGQAPCrossover(StorableConstructorFlag _) : base(_) { } 57 58 protected MultiGQAPCrossover(MultiGQAPCrossover original, Cloner cloner) : base(original, cloner) { } 58 59 public MultiGQAPCrossover() -
branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/LocalImprovers/ApproximateLocalSearch.cs
r16077 r16712 32 32 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 33 33 using HeuristicLab.Random; 34 using HEAL.Attic; 34 35 35 36 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment { … … 38 39 /// </summary> 39 40 [Item("ApproximateLocalSearch", "The approximate local search 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.")] 40 [Storable Class]41 [StorableType("58C75FBC-C586-4048-A60B-DCF967CB2E33")] 41 42 public class ApproximateLocalSearch : SingleSuccessorOperator, IProblemInstanceAwareGQAPOperator, 42 43 IQualityAwareGQAPOperator, IGQAPLocalImprovementOperator, IAssignmentAwareGQAPOperator, IStochasticOperator { … … 81 82 82 83 [StorableConstructor] 83 protected ApproximateLocalSearch( bool deserializing) : base(deserializing) { }84 protected ApproximateLocalSearch(StorableConstructorFlag _) : base(_) { } 84 85 protected ApproximateLocalSearch(ApproximateLocalSearch original, Cloner cloner) : base(original, cloner) { } 85 86 public ApproximateLocalSearch() -
branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/LocalImprovers/OneOptLocalSearch.cs
r16077 r16712 32 32 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 33 33 using HeuristicLab.Random; 34 using HEAL.Attic; 34 35 35 36 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment { 36 37 [Item("1-opt LocalSearch", "A simple exhaustive 1-change local search.")] 37 [Storable Class]38 [StorableType("C574770B-AB1E-46BE-8B3F-C8C5B2AD3ACF")] 38 39 public class OneOptLocalSearch : SingleSuccessorOperator, IProblemInstanceAwareGQAPOperator, 39 40 IQualityAwareGQAPOperator, IGQAPLocalImprovementOperator, IAssignmentAwareGQAPOperator, IStochasticOperator { … … 69 70 70 71 [StorableConstructor] 71 protected OneOptLocalSearch( bool deserializing) : base(deserializing) { }72 protected OneOptLocalSearch(StorableConstructorFlag _) : base(_) { } 72 73 protected OneOptLocalSearch(OneOptLocalSearch original, Cloner cloner) : base(original, cloner) { } 73 74 public OneOptLocalSearch() -
branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/Manipulators/DemandEquivalentSwapEquipmentManipluator.cs
r16077 r16712 29 29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 30 30 using HeuristicLab.Random; 31 using HEAL.Attic; 31 32 32 33 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment { 33 34 34 35 [Item("DemandEquivalentSwapEquipmentManipluator", "Swaps equipment X from location A with as much equipments from location B that the demand of X is less than or equal to the demand of the swapped equipments in B.")] 35 [Storable Class]36 [StorableType("1FC9A377-D187-414D-9901-D9B26C0BF98E")] 36 37 public class DemandEquivalentSwapEquipmentManipluator : GQAPManipulator { 37 38 38 39 [StorableConstructor] 39 protected DemandEquivalentSwapEquipmentManipluator( bool deserializing) : base(deserializing) { }40 protected DemandEquivalentSwapEquipmentManipluator(StorableConstructorFlag _) : base(_) { } 40 41 protected DemandEquivalentSwapEquipmentManipluator(DemandEquivalentSwapEquipmentManipluator original, Cloner cloner) : base(original, cloner) { } 41 42 public DemandEquivalentSwapEquipmentManipluator() -
branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/Manipulators/GQAPManipulator.cs
r16077 r16712 27 27 using HeuristicLab.Parameters; 28 28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 29 using HEAL.Attic; 29 30 30 31 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment { 31 32 [Item("GQAPManipulator", "A base class for operators that manipulate assignment vectors of the GeneralizedQuadraticAssignment problems.")] 32 [Storable Class]33 [StorableType("4AC3D0BB-2BAA-4910-A806-7673BE3E7FEC")] 33 34 public abstract class GQAPManipulator : SingleSuccessorOperator, IGQAPManipulator, IProblemInstanceAwareGQAPOperator, IStochasticOperator { 34 35 public override bool CanChangeName { … … 48 49 49 50 [StorableConstructor] 50 protected GQAPManipulator( bool deserializing) : base(deserializing) { }51 protected GQAPManipulator(StorableConstructorFlag _) : base(_) { } 51 52 protected GQAPManipulator(GQAPManipulator original, Cloner cloner) : base(original, cloner) { } 52 53 protected GQAPManipulator() -
branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/Manipulators/MultiGQAPManipulator.cs
r16077 r16712 31 31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 32 32 using HeuristicLab.PluginInfrastructure; 33 using HEAL.Attic; 33 34 34 35 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment { 35 36 [Item("MultiGQAPManipulator", "Randomly selects and applies one of its manipulators every time it is called.")] 36 [Storable Class]37 [StorableType("CA2893AC-EECE-4F3A-A12E-81DC838ADC3C")] 37 38 public class MultiGQAPManipulator : StochasticMultiBranch<IGQAPManipulator>, IGQAPManipulator, 38 39 IProblemInstanceAwareGQAPOperator { … … 52 53 53 54 [StorableConstructor] 54 protected MultiGQAPManipulator( bool deserializing) : base(deserializing) { }55 protected MultiGQAPManipulator(StorableConstructorFlag _) : base(_) { } 55 56 protected MultiGQAPManipulator(MultiGQAPManipulator original, Cloner cloner) : base(original, cloner) { } 56 57 public MultiGQAPManipulator() -
branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/Manipulators/RelocateEquipmentManipluator.cs
r16077 r16712 27 27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 28 28 using HeuristicLab.Random; 29 using HEAL.Attic; 29 30 30 31 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment { 31 32 32 33 [Item("RelocateEquipmentManipluator", "Relocates a random equipment from an overstuffed location to a random one with space or a random equipment if constraints are satisfied.")] 33 [Storable Class]34 [StorableType("B696CF26-6654-4CFC-8527-752C9F16F7DD")] 34 35 public class RelocateEquipmentManipluator : GQAPManipulator { 35 36 36 37 [StorableConstructor] 37 protected RelocateEquipmentManipluator( bool deserializing) : base(deserializing) { }38 protected RelocateEquipmentManipluator(StorableConstructorFlag _) : base(_) { } 38 39 protected RelocateEquipmentManipluator(RelocateEquipmentManipluator original, Cloner cloner) : base(original, cloner) { } 39 40 public RelocateEquipmentManipluator() -
branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/Manipulators/SwapEquipmentManipluator.cs
r16077 r16712 25 25 using HeuristicLab.Encodings.IntegerVectorEncoding; 26 26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 27 using HEAL.Attic; 27 28 28 29 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment { 29 30 30 31 [Item("SwapEquipmentManipluator", "Swaps two equipments by placing each in the location of the other.")] 31 [Storable Class]32 [StorableType("FC7FD665-84A3-4BEA-A139-8248120375E0")] 32 33 public class SwapEquipmentManipluator : GQAPManipulator { 33 34 34 35 [StorableConstructor] 35 protected SwapEquipmentManipluator( bool deserializing) : base(deserializing) { }36 protected SwapEquipmentManipluator(StorableConstructorFlag _) : base(_) { } 36 37 protected SwapEquipmentManipluator(SwapEquipmentManipluator original, Cloner cloner) : base(original, cloner) { } 37 38 public SwapEquipmentManipluator() -
branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/Manipulators/SwapLocationManipulator.cs
r16077 r16712 26 26 using HeuristicLab.Encodings.IntegerVectorEncoding; 27 27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 28 using HEAL.Attic; 28 29 29 30 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment { 30 31 31 32 [Item("SwapLocationManipluator", "Swaps two locations by exchanging all equipments between the locations.")] 32 [Storable Class]33 [StorableType("F0828F68-42FD-4B3E-9E55-5A7145A442AB")] 33 34 public class SwapLocationManipluator : GQAPManipulator { 34 35 35 36 [StorableConstructor] 36 protected SwapLocationManipluator( bool deserializing) : base(deserializing) { }37 protected SwapLocationManipluator(StorableConstructorFlag _) : base(_) { } 37 38 protected SwapLocationManipluator(SwapLocationManipluator original, Cloner cloner) : base(original, cloner) { } 38 39 public SwapLocationManipluator() -
branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/Shakers/NMoveShakingOperator.cs
r16077 r16712 28 28 using HeuristicLab.Parameters; 29 29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 30 using HEAL.Attic; 30 31 31 32 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Operators { 32 33 [Item("NMoveShakingOperator", "Performs a number of shaking operations that increase in strength.")] 33 [Storable Class]34 [StorableType("22D9F959-9BAB-497D-B593-FF19BD8CE9AB")] 34 35 public class NMoveShakingOperator : SingleSuccessorOperator, IProblemInstanceAwareGQAPOperator, 35 36 IAssignmentAwareGQAPOperator, IMultiNeighborhoodShakingOperator, IStochasticOperator { … … 53 54 54 55 [StorableConstructor] 55 protected NMoveShakingOperator( bool deserializing) : base(deserializing) { }56 protected NMoveShakingOperator(StorableConstructorFlag _) : base(_) { } 56 57 protected NMoveShakingOperator(NMoveShakingOperator original, Cloner cloner) : base(original, cloner) { } 57 58 public NMoveShakingOperator() { -
branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Plugin.cs.frame
r16077 r16712 25 25 [Plugin("HeuristicLab.Problems.GeneralizedQuadraticAssignment", "3.3.15.$WCREV$")] 26 26 [PluginFile("HeuristicLab.Problems.GeneralizedQuadraticAssignment-3.3.dll", PluginFileType.Assembly)] 27 [PluginDependency("HeuristicLab.Attic", "1.0")] 27 28 [PluginDependency("HeuristicLab.Analysis", "3.3")] 28 29 [PluginDependency("HeuristicLab.Collections", "3.3")] -
branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/SolutionCreators/GQAPSolutionCreator.cs
r16077 r16712 27 27 using HeuristicLab.Parameters; 28 28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 29 using HEAL.Attic; 29 30 30 31 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment { 31 32 [Item("GQAPSolutionCreator", "Base class for solution creators of the Generalized Quadratic Assignment Problem.")] 32 [Storable Class]33 [StorableType("1FD56558-5E7C-470C-8E7C-B3CEF7DB1D61")] 33 34 public abstract class GQAPSolutionCreator : SingleSuccessorOperator, IProblemInstanceAwareGQAPOperator, IGQAPSolutionCreator { 34 35 … … 51 52 52 53 [StorableConstructor] 53 protected GQAPSolutionCreator( bool deserializing) : base(deserializing) { }54 protected GQAPSolutionCreator(StorableConstructorFlag _) : base(_) { } 54 55 protected GQAPSolutionCreator(GQAPSolutionCreator original, Cloner cloner) 55 56 : base(original, cloner) { } -
branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/SolutionCreators/GQAPStochasticSolutionCreator.cs
r16077 r16712 26 26 using HeuristicLab.Parameters; 27 27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 28 using HEAL.Attic; 28 29 29 30 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment { 30 31 [Item("GQAPStochasticSolutionCreator", "Base class for stochastic solution creators of the Generalized Quadratic Assignment Problem.")] 31 [Storable Class]32 [StorableType("D7789768-032F-4EAB-ADED-FF4DD5A23B99")] 32 33 public abstract class GQAPStochasticSolutionCreator : GQAPSolutionCreator, IStochasticOperator { 33 34 … … 37 38 38 39 [StorableConstructor] 39 protected GQAPStochasticSolutionCreator( bool deserializing) : base(deserializing) { }40 protected GQAPStochasticSolutionCreator(StorableConstructorFlag _) : base(_) { } 40 41 protected GQAPStochasticSolutionCreator(GQAPStochasticSolutionCreator original, Cloner cloner) 41 42 : base(original, cloner) { } -
branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/SolutionCreators/GreedyRandomizedSolutionCreator.cs
r16077 r16712 31 31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 32 32 using HeuristicLab.Random; 33 using HEAL.Attic; 33 34 34 35 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment { … … 37 38 /// </summary> 38 39 [Item("GreedyRandomizedSolutionCreator", "Creates a solution according to the procedure 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.")] 39 [Storable Class]40 [StorableType("44919EFC-AF47-4F0D-8EE4-F5AECBF776CA")] 40 41 public class GreedyRandomizedSolutionCreator : GQAPStochasticSolutionCreator { 41 42 … … 48 49 49 50 [StorableConstructor] 50 protected GreedyRandomizedSolutionCreator( bool deserializing) : base(deserializing) { }51 protected GreedyRandomizedSolutionCreator(StorableConstructorFlag _) : base(_) { } 51 52 protected GreedyRandomizedSolutionCreator(GreedyRandomizedSolutionCreator original, Cloner cloner) 52 53 : base(original, cloner) { } -
branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/SolutionCreators/RandomButFeasibleSolutionCreator.cs
r16077 r16712 31 31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 32 32 using HeuristicLab.Random; 33 using HEAL.Attic; 33 34 34 35 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment { 35 36 [Item("RandomButFeasibleSolutionCreator", "Creates a random, but feasible solution to the Generalized Quadratic Assignment Problem.")] 36 [Storable Class]37 [StorableType("3C194DAF-81A9-4FA3-AE7F-45951FC33DE1")] 37 38 public class RandomFeasibleSolutionCreator : GQAPStochasticSolutionCreator { 38 39 … … 45 46 46 47 [StorableConstructor] 47 protected RandomFeasibleSolutionCreator( bool deserializing) : base(deserializing) { }48 protected RandomFeasibleSolutionCreator(StorableConstructorFlag _) : base(_) { } 48 49 protected RandomFeasibleSolutionCreator(RandomFeasibleSolutionCreator original, Cloner cloner) : base(original, cloner) { } 49 50 public RandomFeasibleSolutionCreator() -
branches/2936_GQAPIntegration/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/SolutionCreators/SlackMinimizationSolutionCreator.cs
r16077 r16712 31 31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable; 32 32 using HeuristicLab.Random; 33 using HEAL.Attic; 33 34 34 35 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment { 35 36 [Item("SlackMinimizationSolutionCreator", "A heuristic that creates a solution to the Generalized Quadratic Assignment Problem by minimizing the amount of slack.")] 36 [Storable Class]37 [StorableType("02676A57-A686-4FDB-B912-B3792C749669")] 37 38 public class SlackMinimizationSolutionCreator : GQAPStochasticSolutionCreator { 38 39 … … 51 52 52 53 [StorableConstructor] 53 protected SlackMinimizationSolutionCreator( bool deserializing) : base(deserializing) { }54 protected SlackMinimizationSolutionCreator(StorableConstructorFlag _) : base(_) { } 54 55 protected SlackMinimizationSolutionCreator(SlackMinimizationSolutionCreator original, Cloner cloner) : base(original, cloner) { } 55 56 public SlackMinimizationSolutionCreator()
Note: See TracChangeset
for help on using the changeset viewer.