Ignore:
Timestamp:
07/07/19 23:40:10 (3 years ago)
Author:
mkommend
Message:

#2520: Merged 16565 - 16579 into stable.

Location:
stable
Files:
8 edited
1 copied

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.Algorithms.GeneticAlgorithm/3.3/GeneticAlgorithm.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.
     
    2222using System;
    2323using System.Linq;
     24using HEAL.Attic;
    2425using HeuristicLab.Analysis;
    2526using HeuristicLab.Common;
     
    3031using HeuristicLab.Optimization.Operators;
    3132using HeuristicLab.Parameters;
    32 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    3333using HeuristicLab.PluginInfrastructure;
    3434using HeuristicLab.Random;
     
    4040  [Item("Genetic Algorithm (GA)", "A genetic algorithm.")]
    4141  [Creatable(CreatableAttribute.Categories.PopulationBasedAlgorithms, Priority = 100)]
    42   [StorableClass]
     42  [StorableType("B63D21BD-D6AE-474B-A319-AC92CCB30AF6")]
    4343  public sealed class GeneticAlgorithm : HeuristicOptimizationEngineAlgorithm, IStorableContent {
    4444    public string Filename { get; set; }
     
    213213    }
    214214    [StorableConstructor]
    215     private GeneticAlgorithm(bool deserializing) : base(deserializing) { }
     215    private GeneticAlgorithm(StorableConstructorFlag _) : base(_) { }
    216216    [StorableHook(HookType.AfterDeserialization)]
    217217    private void AfterDeserialization() {
  • stable/HeuristicLab.Algorithms.GeneticAlgorithm/3.3/GeneticAlgorithmMainLoop.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("GeneticAlgorithmMainLoop", "An operator which represents the main loop of a genetic algorithm.")]
    36   [StorableClass]
     36  [StorableType("890C1856-16C9-45F0-A0DD-67A152A70D28")]
    3737  public sealed class GeneticAlgorithmMainLoop : AlgorithmOperator {
    3838    #region Parameter properties
     
    9292
    9393    [StorableConstructor]
    94     private GeneticAlgorithmMainLoop(bool deserializing) : base(deserializing) { }
     94    private GeneticAlgorithmMainLoop(StorableConstructorFlag _) : base(_) { }
    9595    private GeneticAlgorithmMainLoop(GeneticAlgorithmMainLoop original, Cloner cloner)
    9696      : base(original, cloner) {
  • stable/HeuristicLab.Algorithms.GeneticAlgorithm/3.3/HeuristicLab.Algorithms.GeneticAlgorithm-3.3.csproj

    r11920 r17097  
    2020    <StartupObject>
    2121    </StartupObject>
    22     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     22    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
    2323    <TargetFrameworkProfile>
    2424    </TargetFrameworkProfile>
     
    107107  </PropertyGroup>
    108108  <ItemGroup>
     109    <Reference Include="Google.Protobuf, Version=3.6.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
     110      <HintPath>..\..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll</HintPath>
     111    </Reference>
     112    <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     113      <HintPath>..\..\packages\HEAL.Attic.1.0.0-pre02\lib\net461\HEAL.Attic.dll</HintPath>
     114    </Reference>
    109115    <Reference Include="System" />
    110116    <Reference Include="System.Core">
     
    112118    </Reference>
    113119    <Reference Include="System.Data" />
     120    <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>
    114124    <Reference Include="System.Xml" />
    115125  </ItemGroup>
     
    191201  <ItemGroup>
    192202    <None Include="HeuristicLab.snk" />
     203    <None Include="packages.config" />
    193204    <None Include="Plugin.cs.frame" />
    194205    <None Include="Properties\AssemblyInfo.cs.frame" />
  • stable/HeuristicLab.Algorithms.GeneticAlgorithm/3.3/IslandGeneticAlgorithm.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;
    3333using HeuristicLab.PluginInfrastructure;
    3434using HeuristicLab.Random;
     
    4040  [Item("Island Genetic Algorithm (Island-GA)", "An island genetic algorithm.")]
    4141  [Creatable(CreatableAttribute.Categories.PopulationBasedAlgorithms, Priority = 110)]
    42   [StorableClass]
     42  [StorableType("C36FD509-4EF2-4BA7-9483-8CFCEF7EDA91")]
    4343  public sealed class IslandGeneticAlgorithm : HeuristicOptimizationEngineAlgorithm, IStorableContent {
    4444    public string Filename { get; set; }
     
    203203
    204204    [StorableConstructor]
    205     private IslandGeneticAlgorithm(bool deserializing) : base(deserializing) { }
     205    private IslandGeneticAlgorithm(StorableConstructorFlag _) : base(_) { }
    206206    [StorableHook(HookType.AfterDeserialization)]
    207207    private void AfterDeserialization() {
  • stable/HeuristicLab.Algorithms.GeneticAlgorithm/3.3/IslandGeneticAlgorithmMainLoop.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.
     
    2727using HeuristicLab.Optimization.Operators;
    2828using HeuristicLab.Parameters;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    3030using HeuristicLab.Selection;
    3131
     
    3535  /// </summary>
    3636  [Item("IslandGeneticAlgorithmMainLoop", "An island genetic algorithm main loop operator.")]
    37   [StorableClass]
     37  [StorableType("E015F135-AA23-4425-A84A-DEF880185D0A")]
    3838  public sealed class IslandGeneticAlgorithmMainLoop : AlgorithmOperator {
    3939    #region Parameter Properties
     
    119119
    120120    [StorableConstructor]
    121     private IslandGeneticAlgorithmMainLoop(bool deserializing) : base(deserializing) { }
     121    private IslandGeneticAlgorithmMainLoop(StorableConstructorFlag _) : base(_) { }
    122122    private IslandGeneticAlgorithmMainLoop(IslandGeneticAlgorithmMainLoop original, Cloner cloner)
    123123      : base(original, cloner) {
  • stable/HeuristicLab.Algorithms.GeneticAlgorithm/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.GeneticAlgorithm/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.GeneticAlgorithm/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.