Ignore:
Timestamp:
07/07/19 23:40:10 (22 months ago)
Author:
mkommend
Message:

#2520: Merged 16565 - 16579 into stable.

Location:
stable
Files:
16 edited
1 copied

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.Random

  • stable/HeuristicLab.Random/3.3/FastRandom.cs

    r8928 r17097  
    22using HeuristicLab.Common;
    33using HeuristicLab.Core;
    4 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     4using HEAL.Attic;
    55
    66namespace HeuristicLab.Random {
     
    4343  ///   
    4444  /// </summary>
    45   [StorableClass]
     45  [StorableType("BC86BFF3-80B5-4C77-9D8C-B29576032634")]
    4646  public sealed class FastRandom : Item, IRandom {
    4747    // The +1 ensures NextDouble doesn't generate 1.0
     
    5959    /// <param name="deserializing">true, if the constructor is called during deserialization.</param>
    6060    [StorableConstructor]
    61     private FastRandom(bool deserializing) : base(deserializing) { }
     61    private FastRandom(StorableConstructorFlag _) : base(_) { }
    6262
    6363    /// <summary>
  • stable/HeuristicLab.Random/3.3/GammaDistributedRandom.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.
     
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626using HeuristicLab.Random;
    2727
     
    3333  /// </summary>
    3434  [Item("GammaDistributedRandom", "A pseudo random number generator for gamma distributed random numbers.")]
    35   [StorableClass]
     35  [StorableType("5DA8921C-5026-4B20-9F64-2C6EF0BF8B33")]
    3636  public sealed class GammaDistributedRandom : Item, IRandom {
    3737    [Storable]
     
    6363
    6464    [StorableConstructor]
    65     private GammaDistributedRandom(bool deserializing) : base(deserializing) { }
     65    private GammaDistributedRandom(StorableConstructorFlag _) : base(_) { }
    6666
    6767    private GammaDistributedRandom(GammaDistributedRandom original, Cloner cloner) : base(original, cloner) {
  • stable/HeuristicLab.Random/3.3/HeuristicLab.Random-3.3.csproj

    r16835 r17097  
    1818    <UpgradeBackupLocation>
    1919    </UpgradeBackupLocation>
    20     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     20    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
    2121    <TargetFrameworkProfile>
    2222    </TargetFrameworkProfile>
     
    108108  </PropertyGroup>
    109109  <ItemGroup>
     110    <Reference Include="Google.Protobuf, Version=3.6.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
     111      <HintPath>..\..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll</HintPath>
     112    </Reference>
     113    <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     114      <HintPath>..\..\packages\HEAL.Attic.1.0.0-pre02\lib\net461\HEAL.Attic.dll</HintPath>
     115    </Reference>
    110116    <Reference Include="System" />
    111117    <Reference Include="System.Core">
     
    114120    <Reference Include="System.Data" />
    115121    <Reference Include="System.Drawing" />
     122    <Reference Include="System.Drawing.Common, Version=4.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
     123      <HintPath>..\..\packages\System.Drawing.Common.4.5.1\lib\net461\System.Drawing.Common.dll</HintPath>
     124    </Reference>
    116125    <Reference Include="System.Xml" />
    117126  </ItemGroup>
    118127  <ItemGroup>
     128    <None Include="packages.config" />
    119129    <None Include="Plugin.cs.frame" />
    120130    <Compile Include="GammaDistributedRandom.cs" />
  • stable/HeuristicLab.Random/3.3/ListExtensions.cs

    r15584 r17097  
    22
    33/* HeuristicLab
    4  * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
     4 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
    55 *
    66 * This file is part of HeuristicLab.
  • stable/HeuristicLab.Random/3.3/MersenneTwister.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.
     
    3535using HeuristicLab.Common;
    3636using HeuristicLab.Core;
    37 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     37using HEAL.Attic;
    3838
    3939namespace HeuristicLab.Random {
     
    4242  /// </summary>
    4343  [Item("MersenneTwister", "A high-quality pseudo random number generator which creates uniformly distributed random numbers.")]
    44   [StorableClass]
     44  [StorableType("107BE400-46D0-4CD6-BE80-46F40B6AB148")]
    4545  public sealed class MersenneTwister : Item, IRandom {
    4646    private const int n = 624, m = 397;
     
    5959    /// <param name="deserializing">true, if the constructor is called during deserialization.</param>
    6060    [StorableConstructor]
    61     private MersenneTwister(bool deserializing) : base(deserializing) { }
     61    private MersenneTwister(StorableConstructorFlag _) : base(_) { }
    6262    /// <summary>
    6363    /// Initializes a new instance from an existing one (copy constructor).
  • stable/HeuristicLab.Random/3.3/NormalDistributedRandom.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.
     
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Random {
     
    3333  /// </summary>
    3434  [Item("NormalDistributedRandom", "A pseudo random number generator which uses the Ziggurat method to create normally distributed random numbers.")]
    35   [StorableClass]
     35  [StorableType("240F7050-C05B-4E85-82C3-2871FE2138B1")]
    3636  public sealed class NormalDistributedRandom : Item, IRandom {
    3737    [Storable]
     
    454454    /// <param name="deserializing">true, if the constructor is called during deserialization.</param>
    455455    [StorableConstructor]
    456     private NormalDistributedRandom(bool deserializing) : base(deserializing) { }
     456    private NormalDistributedRandom(StorableConstructorFlag _) : base(_) { }
    457457
    458458    /// <summary>
  • stable/HeuristicLab.Random/3.3/NormalRandomizer.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.
     
    2525using HeuristicLab.Operators;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Random {
     
    3131  /// Normally distributed random number generator.
    3232  /// </summary>
    33   [StorableClass]
     33  [StorableType("0EAF4184-6C98-4C9D-80A1-09A42E03450E")]
    3434  [Item("NormalRandomizer", "Initializes the value of variable 'Value' to a random value normally distributed with parameters 'Mu' and 'Sigma'")]
    3535  public class NormalRandomizer : SingleSuccessorOperator {
     
    6161
    6262    [StorableConstructor]
    63     protected NormalRandomizer(bool deserializing) : base(deserializing) { }
     63    protected NormalRandomizer(StorableConstructorFlag _) : base(_) { }
    6464    protected NormalRandomizer(NormalRandomizer original, Cloner cloner) : base(original, cloner) { }
    6565    /// <summary>
  • stable/HeuristicLab.Random/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.Random/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.Random/3.3/RandomCreator.cs

    r16835 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.
     
    2525using HeuristicLab.Operators;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Random {
     
    3232  /// </summary>
    3333  [Item("RandomCreator", "An operator which creates a new Mersenne Twister pseudo random number generator.")]
    34   [StorableClass]
     34  [StorableType("78A995DA-CE6C-4693-A494-6ABBF1849CEB")]
    3535  public sealed class RandomCreator : SingleSuccessorOperator {
    3636    #region Parameter Properties
     
    6565
    6666    [StorableConstructor]
    67     private RandomCreator(bool deserializing) : base(deserializing) { }
     67    private RandomCreator(StorableConstructorFlag _) : base(_) { }
    6868    private RandomCreator(RandomCreator original, Cloner cloner) : base(original, cloner) { }
    6969    public RandomCreator()
  • stable/HeuristicLab.Random/3.3/RandomEnumerable.cs

    r16580 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.Random/3.3/RandomSeedGenerator.cs

    r16835 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.Random/3.3/UniformDistributedRandom.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.
     
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HEAL.Attic;
    2626
    2727namespace HeuristicLab.Random {
     
    3131  /// </summary>
    3232  [Item("UniformDistributedRandom", "A pseudo random number generator to create uniform distributed random numbers.")]
    33   [StorableClass]
     33  [StorableType("01239E33-7AAD-467A-A95C-6D7E001F5827")]
    3434  public sealed class UniformDistributedRandom : Item, IRandom {
    3535    [Storable]
     
    6161    /// <param name="deserializing">true, if the constructor is called during deserialization.</param>
    6262    [StorableConstructor]
    63     private UniformDistributedRandom(bool deserializing) : base(deserializing) { }
     63    private UniformDistributedRandom(StorableConstructorFlag _) : base(_) { }
    6464
    6565    /// <summary>
  • stable/HeuristicLab.Random/3.3/UniformRandomizer.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.
     
    2525using HeuristicLab.Operators;
    2626using HeuristicLab.Parameters;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828
    2929namespace HeuristicLab.Random {
     
    3131  /// Uniformly distributed random number generator.
    3232  /// </summary>
    33   [StorableClass]
     33  [StorableType("427A6E3A-EC49-4513-9773-768E78F583BF")]
    3434  [Item("UniformRandomizer", "Initializes the value of variable 'Value' to a random value uniformly distributed between 'Min' and 'Max'")]
    3535  public class UniformRandomizer : SingleSuccessorOperator {
     
    6161
    6262    [StorableConstructor]
    63     protected UniformRandomizer(bool deserializing) : base(deserializing) { }
     63    protected UniformRandomizer(StorableConstructorFlag _) : base(_) { }
    6464    protected UniformRandomizer(UniformRandomizer original, Cloner cloner) : base(original, cloner) { }
    6565    /// <summary>
  • stable/HeuristicLab.Random/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.