Ignore:
Timestamp:
07/07/19 23:40:10 (3 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.OffspringSelectionEvolutionStrategy/3.3/HeuristicLab.Algorithms.OffspringSelectionEvolutionStrategy-3.3.csproj

    r13164 r17097  
    1111    <RootNamespace>HeuristicLab.Algorithms.OffspringSelectionEvolutionStrategy</RootNamespace>
    1212    <AssemblyName>HeuristicLab.Algorithms.OffspringSelectionEvolutionStrategy-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">
     
    121131  <ItemGroup>
    122132    <None Include="HeuristicLab.snk" />
     133    <None Include="packages.config" />
    123134    <None Include="Plugin.cs.frame" />
    124135    <None Include="Properties\AssemblyInfo.cs.frame" />
  • stable/HeuristicLab.Algorithms.OffspringSelectionEvolutionStrategy/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.OffspringSelectionEvolutionStrategy/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.OffspringSelectionEvolutionStrategy/3.3/WithoutRepeatingBatchedRandomSelector.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
    3131namespace HeuristicLab.Algorithms.OffspringSelectionEvolutionStrategy {
    3232  [Item("WithoutRepeatingBatchedRandomSelector", "Selects m batches of n parents where in each batch the n parents are drawn without repeating.")]
    33   [StorableClass]
     33  [StorableType("0C394320-895B-4C36-9DC5-92C9505CA0B1")]
    3434  public class WithoutRepeatingBatchedRandomSelector : StochasticSelector {
    3535    public override bool CanChangeName {
     
    4444
    4545    [StorableConstructor]
    46     protected WithoutRepeatingBatchedRandomSelector(bool deserializing) : base(deserializing) { }
     46    protected WithoutRepeatingBatchedRandomSelector(StorableConstructorFlag _) : base(_) { }
    4747    protected WithoutRepeatingBatchedRandomSelector(WithoutRepeatingBatchedRandomSelector original, Cloner cloner)
    4848      : base(original, cloner) {
  • stable/HeuristicLab.Algorithms.OffspringSelectionEvolutionStrategy/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.