- Timestamp:
- 01/28/19 13:41:42 (6 years ago)
- Location:
- trunk
- Files:
-
- 6 edited
- 1 copied
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo changed
/branches/2520_PersistenceReintegration (added) merged: 16451-16454,16462,16465-16468,16470-16472,16474,16476-16477,16479-16487,16529-16530,16539,16551-16555,16558-16559,16562-16564
- Property svn:mergeinfo changed
-
trunk/HeuristicLab.Algorithms.VariableNeighborhoodSearch/3.3/HeuristicLab.Algorithms.VariableNeighborhoodSearch-3.3.csproj
r11623 r16565 11 11 <RootNamespace>HeuristicLab.Algorithms.VariableNeighborhoodSearch</RootNamespace> 12 12 <AssemblyName>HeuristicLab.Algorithms.VariableNeighborhoodSearch-3.3</AssemblyName> 13 <TargetFrameworkVersion>v4. 5</TargetFrameworkVersion>13 <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> 14 14 <TargetFrameworkProfile> 15 15 </TargetFrameworkProfile> … … 99 99 </PropertyGroup> 100 100 <ItemGroup> 101 <Reference Include="Google.Protobuf, Version=3.6.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL"> 102 <HintPath>..\..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll</HintPath> 103 </Reference> 104 <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL"> 105 <HintPath>..\..\packages\HEAL.Attic.1.0.0-pre01\lib\netstandard2.0\HEAL.Attic.dll</HintPath> 106 </Reference> 101 107 <Reference Include="System" /> 102 108 <Reference Include="System.Core"> 103 109 <RequiredTargetFramework>3.5</RequiredTargetFramework> 110 </Reference> 111 <Reference Include="System.Drawing" /> 112 <Reference Include="System.Drawing.Common, Version=4.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL"> 113 <HintPath>..\..\packages\System.Drawing.Common.4.5.1\lib\net461\System.Drawing.Common.dll</HintPath> 104 114 </Reference> 105 115 <Reference Include="System.Xml.Linq"> … … 120 130 <ItemGroup> 121 131 <None Include="HeuristicLab.snk" /> 132 <None Include="packages.config" /> 122 133 <None Include="Plugin.cs.frame" /> 123 134 <None Include="Properties\AssemblyInfo.cs.frame" /> -
trunk/HeuristicLab.Algorithms.VariableNeighborhoodSearch/3.3/Plugin.cs.frame
r15589 r16565 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. -
trunk/HeuristicLab.Algorithms.VariableNeighborhoodSearch/3.3/Properties/AssemblyInfo.cs.frame
r15589 r16565 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. -
trunk/HeuristicLab.Algorithms.VariableNeighborhoodSearch/3.3/VariableNeighborhoodSearch.cs
r15583 r16565 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. … … 30 30 using HeuristicLab.Optimization.Operators; 31 31 using HeuristicLab.Parameters; 32 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;32 using HEAL.Attic; 33 33 using HeuristicLab.PluginInfrastructure; 34 34 using HeuristicLab.Random; … … 37 37 [Item("Variable Neighborhood Search (VNS)", "A variable neighborhood search algorithm based on the description in Mladenovic, N. and Hansen, P. (1997). Variable neighborhood search. Computers & Operations Research Volume 24, Issue 11, pp. 1097-1100.")] 38 38 [Creatable(CreatableAttribute.Categories.SingleSolutionAlgorithms, Priority = 110)] 39 [Storable Class]39 [StorableType("E5FA1D1E-2611-4059-A836-4E89BB24342A")] 40 40 public sealed class VariableNeighborhoodSearch : HeuristicOptimizationEngineAlgorithm, IStorableContent { 41 41 public string Filename { get; set; } … … 119 119 120 120 [StorableConstructor] 121 private VariableNeighborhoodSearch( bool deserializing) : base(deserializing) { }121 private VariableNeighborhoodSearch(StorableConstructorFlag _) : base(_) { } 122 122 private VariableNeighborhoodSearch(VariableNeighborhoodSearch original, Cloner cloner) 123 123 : base(original, cloner) { -
trunk/HeuristicLab.Algorithms.VariableNeighborhoodSearch/3.3/VariableNeighborhoodSearchMainLoop.cs
r15583 r16565 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. … … 27 27 using HeuristicLab.Optimization.Operators; 28 28 using HeuristicLab.Parameters; 29 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;29 using HEAL.Attic; 30 30 using HeuristicLab.Selection; 31 31 … … 35 35 /// </summary> 36 36 [Item("VariableNeighborhoodSearchMainLoop", "An operator which represents the main loop of a variable neighborhood search.")] 37 [Storable Class]37 [StorableType("AB64D449-016E-4D18-82C6-4250DC948E01")] 38 38 public sealed class VariableNeighborhoodSearchMainLoop : AlgorithmOperator { 39 39 #region Parameter properties … … 83 83 84 84 [StorableConstructor] 85 private VariableNeighborhoodSearchMainLoop( bool deserializing) : base(deserializing) { }85 private VariableNeighborhoodSearchMainLoop(StorableConstructorFlag _) : base(_) { } 86 86 public VariableNeighborhoodSearchMainLoop() 87 87 : base() {
Note: See TracChangeset
for help on using the changeset viewer.