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

Legend:

Unmodified
Added
Removed

  • stable

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

    r13952 r17097  
    1010    <RootNamespace>HeuristicLab.Algorithms.RandomSearch</RootNamespace>
    1111    <AssemblyName>HeuristicLab.Algorithms.RandomSearch-3.3</AssemblyName>
    12     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     12    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
    1313    <FileAlignment>512</FileAlignment>
    1414  </PropertyGroup>
    … …  
    7373  </PropertyGroup>
    7474  <ItemGroup>
     75    <Reference Include="Google.Protobuf, Version=3.6.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
     76      <HintPath>..\..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll</HintPath>
     77    </Reference>
     78    <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     79      <HintPath>..\..\packages\HEAL.Attic.1.0.0-pre02\lib\net461\HEAL.Attic.dll</HintPath>
     80    </Reference>
    7581    <Reference Include="System" />
    7682    <Reference Include="System.Core" />
     83    <Reference Include="System.Drawing" />
     84    <Reference Include="System.Drawing.Common, Version=4.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
     85      <HintPath>..\..\packages\System.Drawing.Common.4.5.1\lib\net461\System.Drawing.Common.dll</HintPath>
     86    </Reference>
    7787  </ItemGroup>
    7888  <ItemGroup>
    7989    <Compile Include="RandomSearchAlgorithm.cs" />
    8090    <None Include="HeuristicLab.snk" />
     91    <None Include="packages.config" />
    8192    <None Include="Plugin.cs.frame" />
    8293    <Compile Include="Plugin.cs" />

  • stable/HeuristicLab.Algorithms.RandomSearch/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.RandomSearch/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.RandomSearch/3.3/RandomSearchAlgorithm.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("Random Search Algorithm (RS)", "A random search algorithm.")]
    3838  [Creatable(CreatableAttribute.Categories.SingleSolutionAlgorithms, Priority = 150)]
    39   [StorableClass]
     39  [StorableType("51EFBCCE-00A7-4E97-8177-85774E71E681")]
    4040  public sealed class RandomSearchAlgorithm : HeuristicOptimizationEngineAlgorithm, IStorableContent {
    4141    public string Filename { get; set; }
    … …  
    128128    #region Constructors
    129129    [StorableConstructor]
    130     private RandomSearchAlgorithm(bool deserializing)
    131       : base(deserializing) { }
     130    private RandomSearchAlgorithm(StorableConstructorFlag _) : base(_) { }
    132131    [StorableHook(HookType.AfterDeserialization)]
    133132    private void AfterDeserialization() {

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