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.Problems.QuadraticAssignment.Algorithms/3.3/HeuristicLab.Problems.QuadraticAssignment.Algorithms-3.3.csproj

    r11920 r17097  
    1111    <RootNamespace>HeuristicLab.Problems.QuadraticAssignment.Algorithms</RootNamespace>
    1212    <AssemblyName>HeuristicLab.Problems.QuadraticAssignment.Algorithms-3.3</AssemblyName>
    13     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     13    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
    1414    <FileAlignment>512</FileAlignment>
    1515    <TargetFrameworkProfile />
    … …  
    109109  </PropertyGroup>
    110110  <ItemGroup>
     111    <Reference Include="Google.Protobuf, Version=3.6.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
     112      <HintPath>..\..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll</HintPath>
     113    </Reference>
     114    <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     115      <HintPath>..\..\packages\HEAL.Attic.1.0.0-pre02\lib\net461\HEAL.Attic.dll</HintPath>
     116    </Reference>
    111117    <Reference Include="System" />
    112118    <Reference Include="System.Core" />
    113119    <Reference Include="System.Data" />
    114120    <Reference Include="System.Drawing" />
     121    <Reference Include="System.Drawing.Common, Version=4.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
     122      <HintPath>..\..\packages\System.Drawing.Common.4.5.1\lib\net461\System.Drawing.Common.dll</HintPath>
     123    </Reference>
    115124  </ItemGroup>
    116125  <ItemGroup>
    117126    <Compile Include="RobustTabooSeachOperator.cs" />
    118127    <Compile Include="RobustTabooSearch.cs" />
     128    <None Include="packages.config" />
    119129    <None Include="Plugin.cs.frame" />
    120130    <Compile Include="Plugin.cs" />

  • stable/HeuristicLab.Problems.QuadraticAssignment.Algorithms/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.Problems.QuadraticAssignment.Algorithms/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.Problems.QuadraticAssignment.Algorithms/3.3/RobustTabooSeachOperator.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.
    … …  
    2828using HeuristicLab.Optimization;
    2929using HeuristicLab.Parameters;
    30 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HEAL.Attic;
    3131
    3232namespace HeuristicLab.Problems.QuadraticAssignment.Algorithms {
    3333  [Item("RobustTabooSearchOperator", "Performs an iteration of the robust taboo search algorithm as descrbied in Taillard 1991.")]
    34   [StorableClass]
     34  [StorableType("D4916F45-70B0-4D02-8377-6E82BA079167")]
    3535  public sealed class RobustTabooSeachOperator : SingleSuccessorOperator, IIterationBasedOperator, IStochasticOperator, ISingleObjectiveOperator {
    3636
    … …  
    103103
    104104    [StorableConstructor]
    105     private RobustTabooSeachOperator(bool deserializing) : base(deserializing) { }
     105    private RobustTabooSeachOperator(StorableConstructorFlag _) : base(_) { }
    106106    private RobustTabooSeachOperator(RobustTabooSeachOperator original, Cloner cloner)
    107107      : base(original, cloner) {

  • stable/HeuristicLab.Problems.QuadraticAssignment.Algorithms/3.3/RobustTabooSearch.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("Robust Taboo Search (RTS)", "The algorithm is described in Taillard, E. 1991. Robust Taboo Search for the Quadratic Assignment Problem. Parallel Computing 17, pp. 443-455.")]
    3838  [Creatable(CreatableAttribute.Categories.SingleSolutionAlgorithms, Priority = 130)]
    39   [StorableClass]
     39  [StorableType("8D1BB2DF-2093-46EB-AB9F-C5ABC1D749B6")]
    4040  public sealed class RobustTabooSearch : HeuristicOptimizationEngineAlgorithm, IStorableContent {
    4141    public string Filename { get; set; }
    … …  
    131131
    132132    [StorableConstructor]
    133     private RobustTabooSearch(bool deserializing) : base(deserializing) { }
     133    private RobustTabooSearch(StorableConstructorFlag _) : base(_) { }
    134134    private RobustTabooSearch(RobustTabooSearch original, Cloner cloner)
    135135      : base(original, cloner) {

  • stable/HeuristicLab.Problems.QuadraticAssignment.Algorithms/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.