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:
7 edited
1 copied

Legend:

Unmodified
Added
Removed

  • stable

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

    r11920 r17097  
    1111    <RootNamespace>HeuristicLab.Algorithms.LocalSearch</RootNamespace>
    1212    <AssemblyName>HeuristicLab.Algorithms.LocalSearch-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>
    … …  
    122131  <ItemGroup>
    123132    <None Include="HeuristicLab.snk" />
     133    <None Include="packages.config" />
    124134    <None Include="Plugin.cs.frame" />
    125135    <None Include="Properties\AssemblyInfo.cs.frame" />

  • stable/HeuristicLab.Algorithms.LocalSearch/3.3/LocalSearch.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("Local Search (LS)", "A local search algorithm.")]
    3838  [Creatable(CreatableAttribute.Categories.SingleSolutionAlgorithms, Priority = 100)]
    39   [StorableClass]
     39  [StorableType("399F7E6A-4111-4F91-BB99-EFE721789E27")]
    4040  public sealed class LocalSearch : HeuristicOptimizationEngineAlgorithm, IStorableContent {
    4141    public string Filename { get; set; }
    … …  
    125125
    126126    [StorableConstructor]
    127     private LocalSearch(bool deserializing) : base(deserializing) { }
     127    private LocalSearch(StorableConstructorFlag _) : base(_) { }
    128128    [StorableHook(HookType.AfterDeserialization)]
    129129    private void AfterDeserialization() {

  • stable/HeuristicLab.Algorithms.LocalSearch/3.3/LocalSearchImprovementOperator.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;
    3333
    3434namespace HeuristicLab.Algorithms.LocalSearch {
    … …  
    3737  /// </summary>
    3838  [Item("LocalSearchImprovementOperator", "A local search improvement operator.")]
    39   [StorableClass]
     39  [StorableType("40424217-DBA8-4787-A38A-2AE7130CB69D")]
    4040  public sealed class LocalSearchImprovementOperator : SingleSuccessorOperator, ILocalImprovementAlgorithmOperator, IStochasticOperator, ISingleObjectiveOperator {
    4141    #region IGenericLocalImprovementOperator Properties
    … …  
    118118
    119119    [StorableConstructor]
    120     private LocalSearchImprovementOperator(bool deserializing) : base(deserializing) { }
     120    private LocalSearchImprovementOperator(StorableConstructorFlag _) : base(_) { }
    121121    private LocalSearchImprovementOperator(LocalSearchImprovementOperator original, Cloner cloner)
    122122      : base(original, cloner) {

  • stable/HeuristicLab.Algorithms.LocalSearch/3.3/LocalSearchMainLoop.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.Optimization.Operators;
    2727using HeuristicLab.Parameters;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HEAL.Attic;
    2929using HeuristicLab.Selection;
    3030
    … …  
    3434  /// </summary>
    3535  [Item("LocalSearchMainLoop", "An operator which represents the main loop of a best improvement local search (if only a single move is generated in each iteration it is a first improvement local search).")]
    36   [StorableClass]
     36  [StorableType("629DEE28-5E94-44C2-AFDA-83F7F0128091")]
    3737  public sealed class LocalSearchMainLoop : AlgorithmOperator {
    3838    #region Parameter properties
    … …  
    8282
    8383    [StorableConstructor]
    84     private LocalSearchMainLoop(bool deserializing) : base(deserializing) { }
     84    private LocalSearchMainLoop(StorableConstructorFlag _) : base(_) { }
    8585    public LocalSearchMainLoop()
    8686      : base() {

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