Free cookie consent management tool by TermsFeed Policy Generator

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

#2520: Merged 16565 - 16579 into stable.

Location:
stable
Files:
12 edited
1 copied

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.Algorithms.MOCMAEvolutionStrategy

  • stable/HeuristicLab.Algorithms.MOCMAEvolutionStrategy/3.3/DoubleMatrixHelper.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 * and the BEACON Center for the Study of Evolution in Action.
    55 *
  • stable/HeuristicLab.Algorithms.MOCMAEvolutionStrategy/3.3/HeuristicLab.Algorithms.MOCMAEvolutionStrategy-3.3.csproj

    r15244 r17097  
    1010    <RootNamespace>HeuristicLab.Algorithms.MOCMAEvolutionStrategy</RootNamespace>
    1111    <AssemblyName>HeuristicLab.Algorithms.MOCMAEvolutionStrategy-3.3</AssemblyName>
    12     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     12    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
    1313    <FileAlignment>512</FileAlignment>
    1414  </PropertyGroup>
     
    7777      <Private>False</Private>
    7878    </Reference>
     79    <Reference Include="Google.Protobuf, Version=3.6.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
     80      <HintPath>..\..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll</HintPath>
     81    </Reference>
     82    <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
     83      <HintPath>..\..\packages\HEAL.Attic.1.0.0-pre02\lib\net461\HEAL.Attic.dll</HintPath>
     84    </Reference>
    7985    <Reference Include="System" />
    8086    <Reference Include="System.Core" />
    8187    <Reference Include="System.Drawing" />
    82   </ItemGroup>
    83   <ItemGroup>
     88    <Reference Include="System.Drawing.Common, Version=4.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
     89      <HintPath>..\..\packages\System.Drawing.Common.4.5.1\lib\net461\System.Drawing.Common.dll</HintPath>
     90    </Reference>
     91  </ItemGroup>
     92  <ItemGroup>
     93    <None Include="packages.config" />
    8494    <None Include="Plugin.cs.frame" />
    8595    <None Include="Properties\AssemblyInfo.cs.frame" />
  • stable/HeuristicLab.Algorithms.MOCMAEvolutionStrategy/3.3/IIndicator.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.Encodings.RealVectorEncoding;
    2424using HeuristicLab.Optimization;
     25using HEAL.Attic;
    2526
    2627namespace HeuristicLab.Algorithms.MOCMAEvolutionStrategy {
     28  [StorableType("5f3f2453-dbf0-46d8-be15-8b6bb9f88592")]
    2729  public interface IIndicator : IItem {
    2830    /// <summary>
  • stable/HeuristicLab.Algorithms.MOCMAEvolutionStrategy/3.3/Indicators/CrowdingIndicator.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.Encodings.RealVectorEncoding;
    2828using HeuristicLab.Optimization;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    3030
    3131namespace HeuristicLab.Algorithms.MOCMAEvolutionStrategy {
    3232  [Item("CrowdingIndicator", "Selection of Offspring based on CrowdingDistance")]
    33   [StorableClass]
     33  [StorableType("FEC5F17A-C720-4411-8AD6-42BA0F392AE9")]
    3434  internal class CrowdingIndicator : Item, IIndicator {
    3535    #region Constructors and Cloning
    3636    [StorableConstructor]
    37     protected CrowdingIndicator(bool deserializing) : base(deserializing) { }
     37    protected CrowdingIndicator(StorableConstructorFlag _) : base(_) { }
    3838    protected CrowdingIndicator(CrowdingIndicator original, Cloner cloner) : base(original, cloner) { }
    3939    public override IDeepCloneable Clone(Cloner cloner) { return new CrowdingIndicator(this, cloner); }
  • stable/HeuristicLab.Algorithms.MOCMAEvolutionStrategy/3.3/Indicators/HypervolumeIndicator.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.Encodings.RealVectorEncoding;
    2828using HeuristicLab.Optimization;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    3030using HeuristicLab.Problems.TestFunctions.MultiObjective;
    3131namespace HeuristicLab.Algorithms.MOCMAEvolutionStrategy {
    3232  [Item("HypervolumeIndicator", "Selection of Offspring based on contributing Hypervolume")]
    33   [StorableClass]
     33  [StorableType("ADF439D6-64E4-4C92-A4D3-E8C05B050406")]
    3434  internal class HypervolumeIndicator : Item, IIndicator {
    3535    #region Constructors and Cloning
    3636    [StorableConstructor]
    37     protected HypervolumeIndicator(bool deserializing) : base(deserializing) { }
     37    protected HypervolumeIndicator(StorableConstructorFlag _) : base(_) { }
    3838    protected HypervolumeIndicator(HypervolumeIndicator original, Cloner cloner) : base(original, cloner) { }
    3939    public override IDeepCloneable Clone(Cloner cloner) { return new HypervolumeIndicator(this, cloner); }
  • stable/HeuristicLab.Algorithms.MOCMAEvolutionStrategy/3.3/Indicators/MinimalDistanceIndicator.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.Encodings.RealVectorEncoding;
    2828using HeuristicLab.Optimization;
    29 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HEAL.Attic;
    3030
    3131namespace HeuristicLab.Algorithms.MOCMAEvolutionStrategy {
    3232  [Item("MinimalDistanceIndicator", "Selection of Offspring based on distance to nearest neighbour")]
    33   [StorableClass]
     33  [StorableType("FBBD4517-164C-4DEE-B87D-49B99172EDF4")]
    3434  internal class MinimalDistanceIndicator : Item, IIndicator {
    3535
    3636    #region Constructor and Cloning
    3737    [StorableConstructor]
    38     protected MinimalDistanceIndicator(bool deserializing) : base(deserializing) { }
     38    protected MinimalDistanceIndicator(StorableConstructorFlag _) : base(_) { }
    3939    protected MinimalDistanceIndicator(MinimalDistanceIndicator original, Cloner cloner) : base(original, cloner) { }
    4040    public override IDeepCloneable Clone(Cloner cloner) { return new MinimalDistanceIndicator(this, cloner); }
  • stable/HeuristicLab.Algorithms.MOCMAEvolutionStrategy/3.3/Individual.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 * and the BEACON Center for the Study of Evolution in Action.
    55 *
     
    2525using HeuristicLab.Common;
    2626using HeuristicLab.Encodings.RealVectorEncoding;
    27 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HEAL.Attic;
    2828using HeuristicLab.Random;
    2929
    3030namespace HeuristicLab.Algorithms.MOCMAEvolutionStrategy {
    31   [StorableClass]
     31  [StorableType("8D5AF328-84A0-4924-9909-A113CDCFC117")]
    3232  public class Individual : IDeepCloneable {
    3333
     
    6363    #region Constructors and Cloning
    6464    [StorableConstructor]
    65     protected Individual(bool deserializing) { }
     65    protected Individual(StorableConstructorFlag _) { }
    6666
    6767    public Individual(RealVector mean, double pSucc, double sigma, RealVector pc, double[,] c, MOCMAEvolutionStrategy strategy) {
  • stable/HeuristicLab.Algorithms.MOCMAEvolutionStrategy/3.3/MOCMAEvolutionStrategy.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 * and the BEACON Center for the Study of Evolution in Action.
    55 *
     
    3232using HeuristicLab.Optimization;
    3333using HeuristicLab.Parameters;
    34 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     34using HEAL.Attic;
    3535using HeuristicLab.Problems.TestFunctions.MultiObjective;
    3636using HeuristicLab.Random;
     
    3939  [Item("Multi-Objective CMA Evolution Strategy (MOCMAES)", "A multi objective evolution strategy based on covariance matrix adaptation. Code is based on 'Covariance Matrix Adaptation for Multi - objective Optimization' by Igel, Hansen and Roth")]
    4040  [Creatable(CreatableAttribute.Categories.PopulationBasedAlgorithms, Priority = 210)]
    41   [StorableClass]
     41  [StorableType("C10264E3-E4C6-4735-8E94-0DC116E8908D")]
    4242  public class MOCMAEvolutionStrategy : BasicAlgorithm {
    4343    public override Type ProblemType {
     
    265265
    266266    [StorableConstructor]
    267     protected MOCMAEvolutionStrategy(bool deserializing) : base(deserializing) { }
     267    protected MOCMAEvolutionStrategy(StorableConstructorFlag _) : base(_) { }
    268268
    269269    protected MOCMAEvolutionStrategy(MOCMAEvolutionStrategy original, Cloner cloner) : base(original, cloner) {
  • stable/HeuristicLab.Algorithms.MOCMAEvolutionStrategy/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.MOCMAEvolutionStrategy/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.MOCMAEvolutionStrategy/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.