Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
07/07/19 23:40:10 (5 years ago)
Author:
mkommend
Message:

#2520: Merged 16565 - 16579 into stable.

Location:
stable
Files:
6 edited
1 copied

Legend:

Unmodified
Added
Removed

  • stable

  • stable/HeuristicLab.Algorithms.VariableNeighborhoodSearch/3.3/HeuristicLab.Algorithms.VariableNeighborhoodSearch-3.3.csproj

    r11920 r17097  
    1111    <RootNamespace>HeuristicLab.Algorithms.VariableNeighborhoodSearch</RootNamespace>
    1212    <AssemblyName>HeuristicLab.Algorithms.VariableNeighborhoodSearch-3.3</AssemblyName>
    13     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     13    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
    1414    <TargetFrameworkProfile>
    1515    </TargetFrameworkProfile>
    … …  
    9999  </PropertyGroup>
    100100  <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-pre02\lib\net461\HEAL.Attic.dll</HintPath>
     106    </Reference>
    101107    <Reference Include="System" />
    102108    <Reference Include="System.Core">
    103109      <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>
    104114    </Reference>
    105115    <Reference Include="System.Xml.Linq">
    … …  
    120130  <ItemGroup>
    121131    <None Include="HeuristicLab.snk" />
     132    <None Include="packages.config" />
    122133    <None Include="Plugin.cs.frame" />
    123134    <None Include="Properties\AssemblyInfo.cs.frame" />

  • stable/HeuristicLab.Algorithms.VariableNeighborhoodSearch/3.3/Plugin.cs.frame

    r15587 r17097  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • stable/HeuristicLab.Algorithms.VariableNeighborhoodSearch/3.3/Properties/AssemblyInfo.cs.frame

    r15587 r17097  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.

  • stable/HeuristicLab.Algorithms.VariableNeighborhoodSearch/3.3/VariableNeighborhoodSearch.cs

    r15584 r17097  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    3030using HeuristicLab.Optimization.Operators;
    3131using HeuristicLab.Parameters;
    32 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     32using HEAL.Attic;
    3333using HeuristicLab.PluginInfrastructure;
    3434using HeuristicLab.Random;
    … …  
    3737  [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.")]
    3838  [Creatable(CreatableAttribute.Categories.SingleSolutionAlgorithms, Priority = 110)]
    39   [StorableClass]
     39  [StorableType("E5FA1D1E-2611-4059-A836-4E89BB24342A")]
    4040  public sealed class VariableNeighborhoodSearch : HeuristicOptimizationEngineAlgorithm, IStorableContent {
    4141    public string Filename { get; set; }
    … …  
    119119
    120120    [StorableConstructor]
    121     private VariableNeighborhoodSearch(bool deserializing) : base(deserializing) { }
     121    private VariableNeighborhoodSearch(StorableConstructorFlag _) : base(_) { }
    122122    private VariableNeighborhoodSearch(VariableNeighborhoodSearch original, Cloner cloner)
    123123      : base(original, cloner) {

  • stable/HeuristicLab.Algorithms.VariableNeighborhoodSearch/3.3/VariableNeighborhoodSearchMainLoop.cs

    r15584 r17097  
    11#region License Information
    22/* HeuristicLab
    3  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    44 *
    55 * This file is part of HeuristicLab.
    … …  
    2727using HeuristicLab.Optimization.Operators;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    3030using HeuristicLab.Selection;
    3131
    … …  
    3535  /// </summary>
    3636  [Item("VariableNeighborhoodSearchMainLoop", "An operator which represents the main loop of a variable neighborhood search.")]
    37   [StorableClass]
     37  [StorableType("AB64D449-016E-4D18-82C6-4250DC948E01")]
    3838  public sealed class VariableNeighborhoodSearchMainLoop : AlgorithmOperator {
    3939    #region Parameter properties
    … …  
    8383
    8484    [StorableConstructor]
    85     private VariableNeighborhoodSearchMainLoop(bool deserializing) : base(deserializing) { }
     85    private VariableNeighborhoodSearchMainLoop(StorableConstructorFlag _) : base(_) { }
    8686    public VariableNeighborhoodSearchMainLoop()
    8787      : base() {

  • stable/HeuristicLab.Algorithms.VariableNeighborhoodSearch/3.3/packages.config

    r16565 r17097  
    22<packages>
    33  <package id="Google.Protobuf" version="3.6.1" targetFramework="net461" />
    4   <package id="HEAL.Attic" version="1.0.0-pre01" targetFramework="net461" />
     4  <package id="HEAL.Attic" version="1.0.0-pre02" targetFramework="net461" />
    55  <package id="System.Drawing.Common" version="4.5.1" targetFramework="net461" />
    66</packages>
Note: See TracChangeset for help on using the changeset viewer.