- Timestamp:
- 03/28/19 16:54:20 (5 years ago)
- Location:
- branches/2521_ProblemRefactoring
- Files:
-
- 15 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2521_ProblemRefactoring
- Property svn:mergeinfo changed
-
branches/2521_ProblemRefactoring/HeuristicLab.Problems.Knapsack/3.3/Analyzers/BestKnapsackSolutionAnalyzer.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 28 28 using HeuristicLab.Optimization; 29 29 using HeuristicLab.Parameters; 30 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;30 using HEAL.Attic; 31 31 32 32 namespace HeuristicLab.Problems.Knapsack { … … 35 35 /// </summary> 36 36 [Item("BestKnapsackSolutionAnalyzer", "An operator for analyzing the best solution for a Knapsack problem.")] 37 [Storable Class]37 [StorableType("40BCB11E-F9C9-4749-A4FF-831BD8342D1A")] 38 38 public class BestKnapsackSolutionAnalyzer : SingleSuccessorOperator, IBinaryVectorSolutionsOperator, IAnalyzer, ISingleObjectiveOperator { 39 39 public virtual bool EnabledByDefault { … … 73 73 74 74 [StorableConstructor] 75 protected BestKnapsackSolutionAnalyzer( bool deserializing) : base(deserializing) { }75 protected BestKnapsackSolutionAnalyzer(StorableConstructorFlag _) : base(_) { } 76 76 protected BestKnapsackSolutionAnalyzer(BestKnapsackSolutionAnalyzer original, Cloner cloner) : base(original, cloner) { } 77 77 public BestKnapsackSolutionAnalyzer() -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.Knapsack/3.3/HeuristicLab.Problems.Knapsack-3.3.csproj
r13404 r16723 11 11 <RootNamespace>HeuristicLab.Problems.Knapsack</RootNamespace> 12 12 <AssemblyName>HeuristicLab.Problems.Knapsack-3.3</AssemblyName> 13 <TargetFrameworkVersion>v4. 5</TargetFrameworkVersion>13 <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> 14 14 <TargetFrameworkProfile> 15 15 </TargetFrameworkProfile> … … 216 216 </BootstrapperPackage> 217 217 </ItemGroup> 218 <ItemGroup /> 218 <ItemGroup> 219 <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL"> 220 <SpecificVersion>False</SpecificVersion> 221 <HintPath>..\..\bin\HEAL.Attic.dll</HintPath> 222 <Private>False</Private> 223 </Reference> 224 </ItemGroup> 219 225 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> 220 226 <!-- To modify your build process, add your task inside one of the targets below and uncomment it. -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.Knapsack/3.3/Improvers/KnapsackImprovementOperator.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 29 29 using HeuristicLab.Optimization; 30 30 using HeuristicLab.Parameters; 31 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;31 using HEAL.Attic; 32 32 33 33 namespace HeuristicLab.Problems.Knapsack { … … 40 40 /// </remarks> 41 41 [Item("KnapsackImprovementOperator", "An operator that improves knapsack solutions. It is implemented as described in Laguna, M. and Martí, R. (2003). Scatter Search: Methodology and Implementations in C. Operations Research/Computer Science Interfaces Series, Vol. 24. Springer.")] 42 [Storable Class]42 [StorableType("DD57DC5B-8874-49C8-B28F-89962FC11EB2")] 43 43 public sealed class KnapsackImprovementOperator : SingleSuccessorOperator, ISingleObjectiveImprovementOperator { 44 44 #region Parameter properties … … 86 86 87 87 [StorableConstructor] 88 private KnapsackImprovementOperator( bool deserializing) : base(deserializing) { }88 private KnapsackImprovementOperator(StorableConstructorFlag _) : base(_) { } 89 89 private KnapsackImprovementOperator(KnapsackImprovementOperator original, Cloner cloner) : base(original, cloner) { } 90 90 public KnapsackImprovementOperator() -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.Knapsack/3.3/Interfaces/IKnapsackEvaluator.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 21 21 22 22 using HeuristicLab.Optimization; 23 using HEAL.Attic; 23 24 24 25 namespace HeuristicLab.Problems.Knapsack { 26 [StorableType("B7D22238-9840-4293-A12E-6EEF7D7298FD")] 25 27 /// <summary> 26 28 /// An interface which represents an evaluation operator for Knapsack Problems. -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.Knapsack/3.3/Interfaces/IKnapsackMoveEvaluator.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 23 23 using HeuristicLab.Data; 24 24 using HeuristicLab.Optimization; 25 using HEAL.Attic; 25 26 26 27 namespace HeuristicLab.Problems.Knapsack { 28 [StorableType("68FE6DEB-F190-446B-9877-7BE56FB08585")] 27 29 public interface IKnapsackMoveEvaluator : ISingleObjectiveMoveEvaluator, IMoveOperator { 28 30 ILookupParameter<IntValue> KnapsackCapacityParameter { get; } -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.Knapsack/3.3/KnapsackProblem.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 31 31 using HeuristicLab.Optimization.Operators; 32 32 using HeuristicLab.Parameters; 33 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;33 using HEAL.Attic; 34 34 35 35 namespace HeuristicLab.Problems.Knapsack { 36 36 [Item("Knapsack Problem (KSP)", "Represents a Knapsack problem.")] 37 37 [Creatable(CreatableAttribute.Categories.CombinatorialProblems, Priority = 200)] 38 [Storable Class]38 [StorableType("8CEDAFA2-6E0A-4D4B-B6C6-F85CC58B824E")] 39 39 public sealed class KnapsackProblem : SingleObjectiveProblem<BinaryVectorEncoding, BinaryVector> { 40 40 public override bool Maximization { get { return true; } } … … 78 78 79 79 [StorableConstructor] 80 private KnapsackProblem( bool deserializing) : base(deserializing) { }80 private KnapsackProblem(StorableConstructorFlag _) : base(_) { } 81 81 private KnapsackProblem(KnapsackProblem original, Cloner cloner) 82 82 : base(original, cloner) { -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.Knapsack/3.3/KnapsackSolution.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 26 26 using HeuristicLab.Data; 27 27 using HeuristicLab.Encodings.BinaryVectorEncoding; 28 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;28 using HEAL.Attic; 29 29 30 30 namespace HeuristicLab.Problems.Knapsack { … … 33 33 /// </summary> 34 34 [Item("KnapsackSolution", "Represents a Knapsack solution which can be visualized in the GUI.")] 35 [Storable Class]35 [StorableType("C959079D-3D92-4C88-8734-9DADEE851169")] 36 36 public class KnapsackSolution : Item { 37 37 public static new Image StaticItemImage { … … 110 110 111 111 [StorableConstructor] 112 protected KnapsackSolution( bool deserializing) : base(deserializing) { }112 protected KnapsackSolution(StorableConstructorFlag _) : base(_) { } 113 113 protected KnapsackSolution(KnapsackSolution original, Cloner cloner) 114 114 : base(original, cloner) { -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.Knapsack/3.3/MoveEvaluators/KnapsackMoveEvaluator.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 26 26 using HeuristicLab.Operators; 27 27 using HeuristicLab.Parameters; 28 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;28 using HEAL.Attic; 29 29 30 30 namespace HeuristicLab.Problems.Knapsack { … … 33 33 /// </summary> 34 34 [Item("KnapsackMoveEvaluator", "A base class for operators which evaluate Knapsack moves.")] 35 [Storable Class]35 [StorableType("F953FC74-8688-48E5-856D-E9D8A2411CA0")] 36 36 public abstract class KnapsackMoveEvaluator : SingleSuccessorOperator, IKnapsackMoveEvaluator, IBinaryVectorMoveOperator { 37 37 public ILookupParameter<DoubleValue> QualityParameter { … … 55 55 56 56 [StorableConstructor] 57 protected KnapsackMoveEvaluator( bool deserializing) : base(deserializing) { }57 protected KnapsackMoveEvaluator(StorableConstructorFlag _) : base(_) { } 58 58 protected KnapsackMoveEvaluator(KnapsackMoveEvaluator original, Cloner cloner) : base(original, cloner) { } 59 59 protected KnapsackMoveEvaluator() -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.Knapsack/3.3/MoveEvaluators/KnapsackOneBitflipMoveEvaluator.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 25 25 using HeuristicLab.Encodings.BinaryVectorEncoding; 26 26 using HeuristicLab.Parameters; 27 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;27 using HEAL.Attic; 28 28 29 29 namespace HeuristicLab.Problems.Knapsack { … … 32 32 /// </summary> 33 33 [Item("KnapsackOneBitflipMoveEvaluator", "Base class for evaluating one bitflip moves.")] 34 [Storable Class]34 [StorableType("E1BB4CCB-E9C3-4A16-8F03-3F619D4A4B0A")] 35 35 public class KnapsackOneBitflipMoveEvaluator : KnapsackMoveEvaluator, IOneBitflipMoveOperator { 36 36 public ILookupParameter<OneBitflipMove> OneBitflipMoveParameter { … … 39 39 40 40 [StorableConstructor] 41 protected KnapsackOneBitflipMoveEvaluator( bool deserializing) : base(deserializing) { }41 protected KnapsackOneBitflipMoveEvaluator(StorableConstructorFlag _) : base(_) { } 42 42 protected KnapsackOneBitflipMoveEvaluator(KnapsackOneBitflipMoveEvaluator original, Cloner cloner) : base(original, cloner) { } 43 43 public KnapsackOneBitflipMoveEvaluator() -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.Knapsack/3.3/PathRelinkers/KnapsackPathRelinker.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 28 28 using HeuristicLab.Encodings.BinaryVectorEncoding; 29 29 using HeuristicLab.Optimization.Operators; 30 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;30 using HEAL.Attic; 31 31 32 32 namespace HeuristicLab.Problems.Knapsack { … … 38 38 /// </remarks> 39 39 [Item("KnapsackPathRelinker", "An operator that relinks paths between knapsack solutions. The operator incrementally assimilates the initiating solution into the guiding solution by adding and removing elements as needed.")] 40 [Storable Class]40 [StorableType("3A528AB4-5552-4979-B443-2943A3496BC3")] 41 41 public sealed class KnapsackPathRelinker : SingleObjectivePathRelinker { 42 42 [StorableConstructor] 43 private KnapsackPathRelinker( bool deserializing) : base(deserializing) { }43 private KnapsackPathRelinker(StorableConstructorFlag _) : base(_) { } 44 44 private KnapsackPathRelinker(KnapsackPathRelinker original, Cloner cloner) : base(original, cloner) { } 45 45 public KnapsackPathRelinker() : base() { } -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.Knapsack/3.3/PathRelinkers/KnapsackSimultaneousPathRelinker.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 28 28 using HeuristicLab.Encodings.BinaryVectorEncoding; 29 29 using HeuristicLab.Optimization.Operators; 30 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;30 using HEAL.Attic; 31 31 32 32 namespace HeuristicLab.Problems.Knapsack { … … 38 38 /// </remarks> 39 39 [Item("KnapsackSimultaneousPathRelinker", "An operator that relinks paths between knapsack solutions starting from both ends. The operator incrementally assimilates the initiating solution into the guiding solution and vice versa by adding and removing elements as needed.")] 40 [Storable Class]40 [StorableType("8D046D17-BA0F-4974-AF76-95B3F90FB7A4")] 41 41 public sealed class KnapsackSimultaneousPathRelinker : SingleObjectivePathRelinker { 42 42 [StorableConstructor] 43 private KnapsackSimultaneousPathRelinker( bool deserializing) : base(deserializing) { }43 private KnapsackSimultaneousPathRelinker(StorableConstructorFlag _) : base(_) { } 44 44 private KnapsackSimultaneousPathRelinker(KnapsackSimultaneousPathRelinker original, Cloner cloner) : base(original, cloner) { } 45 45 public KnapsackSimultaneousPathRelinker() : base() { } -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.Knapsack/3.3/Plugin.cs.frame
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 39 39 [PluginDependency("HeuristicLab.Optimization.Operators", "3.3")] 40 40 [PluginDependency("HeuristicLab.Parameters", "3.3")] 41 [PluginDependency("HeuristicLab. Persistence", "3.3")]41 [PluginDependency("HeuristicLab.Attic", "1.0")] 42 42 public class HeuristicLabProblemsKnapsackPlugin : PluginBase { 43 43 } -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.Knapsack/3.3/Properties/AssemblyInfo.cs.frame
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2521_ProblemRefactoring/HeuristicLab.Problems.Knapsack/3.3/SimilarityCalculators/KnapsackSimilarityCalculator.cs
r16692 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 21 21 22 22 using System; 23 using HEAL.Attic; 23 24 using HeuristicLab.Common; 24 25 using HeuristicLab.Core; … … 37 38 [NonDiscoverableType] 38 39 [Obsolete("Please use the HammingSimilarityCalculator in the HeuristicLab.Encodings.BinaryVector plugin.")] 40 [StorableType("27FD4466-6FDC-4420-A606-100FC0CDABF6")] 39 41 internal sealed class KnapsackSimilarityCalculator : SingleObjectiveSolutionSimilarityCalculator { 40 42 protected override bool IsCommutative { get { return true; } } 41 43 42 private KnapsackSimilarityCalculator(bool deserializing) : base(deserializing) { } 44 [StorableConstructor] 45 private KnapsackSimilarityCalculator(StorableConstructorFlag _) : base(_) { } 43 46 private KnapsackSimilarityCalculator(KnapsackSimilarityCalculator original, Cloner cloner) : base(original, cloner) { } 44 47 public KnapsackSimilarityCalculator() : base() { }
Note: See TracChangeset
for help on using the changeset viewer.