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

#2520: Merged 16565 - 16579 into stable.

Location:
stable
Files:
9 edited
1 copied

Legend:

Unmodified
Added
Removed
  • stable

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

    r11920 r17097  
    1111    <RootNamespace>HeuristicLab.Algorithms.TabuSearch</RootNamespace>
    1212    <AssemblyName>HeuristicLab.Algorithms.TabuSearch-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">
     
    104110    </Reference>
    105111    <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>
     114    </Reference>
    106115    <Reference Include="System.Xml.Linq">
    107116      <RequiredTargetFramework>3.5</RequiredTargetFramework>
     
    114123  </ItemGroup>
    115124  <ItemGroup>
     125    <None Include="packages.config" />
    116126    <None Include="Plugin.cs.frame" />
    117127    <Compile Include="Plugin.cs" />
  • stable/HeuristicLab.Algorithms.TabuSearch/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.TabuSearch/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.TabuSearch/3.3/TabuListCreator.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.
     
    2424using HeuristicLab.Operators;
    2525using HeuristicLab.Parameters;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HEAL.Attic;
    2727
    2828namespace HeuristicLab.Algorithms.TabuSearch {
    2929  [Item("TabuListCreator", "An operator that creates a new empty tabu list. It can also replace an existing tabu list with a new empty one.")]
    30   [StorableClass]
     30  [StorableType("F199F8AB-35BA-45EB-A7E9-F6352FC053E3")]
    3131  public class TabuListCreator : SingleSuccessorOperator {
    3232    public ValueLookupParameter<ItemList<IItem>> TabuListParameter {
     
    4141
    4242    [StorableConstructor]
    43     protected TabuListCreator(bool deserializing) : base(deserializing) { }
     43    protected TabuListCreator(StorableConstructorFlag _) : base(_) { }
    4444    protected TabuListCreator(TabuListCreator original, Cloner cloner)
    4545      : base(original, cloner) {
  • stable/HeuristicLab.Algorithms.TabuSearch/3.3/TabuNeighborhoodAnalyzer.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;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    3030
    3131namespace HeuristicLab.Algorithms.TabuSearch {
    32   [StorableClass]
     32  [StorableType("C5A3D76E-4E1F-472A-8727-D8506F3BEFEA")]
    3333  [Item("TabuNeighborhoodAnalyzer", "Analyzes the tabu neighborhood")]
    3434  public class TabuNeighborhoodAnalyzer : SingleSuccessorOperator, IAnalyzer {
     
    4848
    4949    [StorableConstructor]
    50     protected TabuNeighborhoodAnalyzer(bool deserializing) : base(deserializing) { }
     50    protected TabuNeighborhoodAnalyzer(StorableConstructorFlag _) : base(_) { }
    5151    protected TabuNeighborhoodAnalyzer(TabuNeighborhoodAnalyzer original, Cloner cloner)
    5252      : base(original, cloner) {
  • stable/HeuristicLab.Algorithms.TabuSearch/3.3/TabuSearch.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.
     
    3131using HeuristicLab.Optimization.Operators;
    3232using HeuristicLab.Parameters;
    33 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     33using HEAL.Attic;
    3434using HeuristicLab.Random;
    3535
     
    3737  [Item("Tabu Search (TS)", "A tabu search algorithm.")]
    3838  [Creatable(CreatableAttribute.Categories.SingleSolutionAlgorithms, Priority = 120)]
    39   [StorableClass]
     39  [StorableType("CF028C58-BE6D-4F74-96DD-B1E2CFAD5AA0")]
    4040  public sealed class TabuSearch : HeuristicOptimizationEngineAlgorithm, IStorableContent {
    4141    public string Filename { get; set; }
     
    205205    }
    206206    [StorableConstructor]
    207     private TabuSearch(bool deserializing) : base(deserializing) { }
     207    private TabuSearch(StorableConstructorFlag _) : base(_) { }
    208208    [StorableHook(HookType.AfterDeserialization)]
    209209    private void AfterDeserialization() {
  • stable/HeuristicLab.Algorithms.TabuSearch/3.3/TabuSearchMainLoop.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("TabuSearchMainLoop", "An operator which represents the main loop of a tabu search.")]
    37   [StorableClass]
     37  [StorableType("85033FBD-B9BA-4450-AA25-B1BEE1B0178D")]
    3838  public sealed class TabuSearchMainLoop : AlgorithmOperator {
    3939    #region Parameter properties
     
    8989
    9090    [StorableConstructor]
    91     private TabuSearchMainLoop(bool deserializing) : base(deserializing) { }
     91    private TabuSearchMainLoop(StorableConstructorFlag _) : base(_) { }
    9292    public TabuSearchMainLoop()
    9393      : base() {
  • stable/HeuristicLab.Algorithms.TabuSearch/3.3/TabuSelector.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.
     
    2626using HeuristicLab.Data;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929using HeuristicLab.Selection;
    3030
     
    3737  /// </remarks>
    3838  [Item("TabuSelector", "An operator that selects the best move that is either not tabu or satisfies the aspiration criterion. It expects the move subscopes to be sorted by the qualities of the moves (the best move is first).")]
    39   [StorableClass]
     39  [StorableType("63A67432-6076-4BDE-B6D5-C9919FAA48DE")]
    4040  public class TabuSelector : Selector {
    4141    /// <summary>
     
    8282
    8383    [StorableConstructor]
    84     protected TabuSelector(bool deserializing) : base(deserializing) { }
     84    protected TabuSelector(StorableConstructorFlag _) : base(_) { }
    8585    protected TabuSelector(TabuSelector original, Cloner cloner)
    8686      : base(original, cloner) {
  • stable/HeuristicLab.Algorithms.TabuSearch/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.