Changeset 16723 for branches/2521_ProblemRefactoring/HeuristicLab.Algorithms.MOCMAEvolutionStrategy/3.3
- Timestamp:
- 03/28/19 16:54:20 (6 years ago)
- Location:
- branches/2521_ProblemRefactoring
- Files:
-
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2521_ProblemRefactoring
- Property svn:mergeinfo changed
-
branches/2521_ProblemRefactoring/HeuristicLab.Algorithms.MOCMAEvolutionStrategy
- Property svn:mergeinfo changed
-
branches/2521_ProblemRefactoring/HeuristicLab.Algorithms.MOCMAEvolutionStrategy/3.3/DoubleMatrixHelper.cs
r15583 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * and the BEACON Center for the Study of Evolution in Action. 5 5 * -
branches/2521_ProblemRefactoring/HeuristicLab.Algorithms.MOCMAEvolutionStrategy/3.3/HeuristicLab.Algorithms.MOCMAEvolutionStrategy-3.3.csproj
r15236 r16723 10 10 <RootNamespace>HeuristicLab.Algorithms.MOCMAEvolutionStrategy</RootNamespace> 11 11 <AssemblyName>HeuristicLab.Algorithms.MOCMAEvolutionStrategy-3.3</AssemblyName> 12 <TargetFrameworkVersion>v4. 5</TargetFrameworkVersion>12 <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> 13 13 <FileAlignment>512</FileAlignment> 14 14 </PropertyGroup> … … 167 167 <Private>False</Private> 168 168 </ProjectReference> 169 </ItemGroup> 170 <ItemGroup> 171 <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL"> 172 <SpecificVersion>False</SpecificVersion> 173 <HintPath>..\..\bin\HEAL.Attic.dll</HintPath> 174 <Private>False</Private> 175 </Reference> 169 176 </ItemGroup> 170 177 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> -
branches/2521_ProblemRefactoring/HeuristicLab.Algorithms.MOCMAEvolutionStrategy/3.3/IIndicator.cs
r15583 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 23 23 using HeuristicLab.Encodings.RealVectorEncoding; 24 24 using HeuristicLab.Optimization; 25 using HEAL.Attic; 25 26 26 27 namespace HeuristicLab.Algorithms.MOCMAEvolutionStrategy { 28 [StorableType("5f3f2453-dbf0-46d8-be15-8b6bb9f88592")] 27 29 public interface IIndicator : IItem { 28 30 /// <summary> -
branches/2521_ProblemRefactoring/HeuristicLab.Algorithms.MOCMAEvolutionStrategy/3.3/Indicators/CrowdingIndicator.cs
r15583 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 27 27 using HeuristicLab.Encodings.RealVectorEncoding; 28 28 using HeuristicLab.Optimization; 29 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;29 using HEAL.Attic; 30 30 31 31 namespace HeuristicLab.Algorithms.MOCMAEvolutionStrategy { 32 32 [Item("CrowdingIndicator", "Selection of Offspring based on CrowdingDistance")] 33 [Storable Class]33 [StorableType("FEC5F17A-C720-4411-8AD6-42BA0F392AE9")] 34 34 internal class CrowdingIndicator : Item, IIndicator { 35 35 #region Constructors and Cloning 36 36 [StorableConstructor] 37 protected CrowdingIndicator( bool deserializing) : base(deserializing) { }37 protected CrowdingIndicator(StorableConstructorFlag _) : base(_) { } 38 38 protected CrowdingIndicator(CrowdingIndicator original, Cloner cloner) : base(original, cloner) { } 39 39 public override IDeepCloneable Clone(Cloner cloner) { return new CrowdingIndicator(this, cloner); } -
branches/2521_ProblemRefactoring/HeuristicLab.Algorithms.MOCMAEvolutionStrategy/3.3/Indicators/HypervolumeIndicator.cs
r15583 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 27 27 using HeuristicLab.Encodings.RealVectorEncoding; 28 28 using HeuristicLab.Optimization; 29 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;29 using HEAL.Attic; 30 30 using HeuristicLab.Problems.TestFunctions.MultiObjective; 31 31 namespace HeuristicLab.Algorithms.MOCMAEvolutionStrategy { 32 32 [Item("HypervolumeIndicator", "Selection of Offspring based on contributing Hypervolume")] 33 [Storable Class]33 [StorableType("ADF439D6-64E4-4C92-A4D3-E8C05B050406")] 34 34 internal class HypervolumeIndicator : Item, IIndicator { 35 35 #region Constructors and Cloning 36 36 [StorableConstructor] 37 protected HypervolumeIndicator( bool deserializing) : base(deserializing) { }37 protected HypervolumeIndicator(StorableConstructorFlag _) : base(_) { } 38 38 protected HypervolumeIndicator(HypervolumeIndicator original, Cloner cloner) : base(original, cloner) { } 39 39 public override IDeepCloneable Clone(Cloner cloner) { return new HypervolumeIndicator(this, cloner); } -
branches/2521_ProblemRefactoring/HeuristicLab.Algorithms.MOCMAEvolutionStrategy/3.3/Indicators/MinimalDistanceIndicator.cs
r15583 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 27 27 using HeuristicLab.Encodings.RealVectorEncoding; 28 28 using HeuristicLab.Optimization; 29 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;29 using HEAL.Attic; 30 30 31 31 namespace HeuristicLab.Algorithms.MOCMAEvolutionStrategy { 32 32 [Item("MinimalDistanceIndicator", "Selection of Offspring based on distance to nearest neighbour")] 33 [Storable Class]33 [StorableType("FBBD4517-164C-4DEE-B87D-49B99172EDF4")] 34 34 internal class MinimalDistanceIndicator : Item, IIndicator { 35 35 36 36 #region Constructor and Cloning 37 37 [StorableConstructor] 38 protected MinimalDistanceIndicator( bool deserializing) : base(deserializing) { }38 protected MinimalDistanceIndicator(StorableConstructorFlag _) : base(_) { } 39 39 protected MinimalDistanceIndicator(MinimalDistanceIndicator original, Cloner cloner) : base(original, cloner) { } 40 40 public override IDeepCloneable Clone(Cloner cloner) { return new MinimalDistanceIndicator(this, cloner); } -
branches/2521_ProblemRefactoring/HeuristicLab.Algorithms.MOCMAEvolutionStrategy/3.3/Individual.cs
r15583 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * and the BEACON Center for the Study of Evolution in Action. 5 5 * … … 25 25 using HeuristicLab.Common; 26 26 using HeuristicLab.Encodings.RealVectorEncoding; 27 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;27 using HEAL.Attic; 28 28 using HeuristicLab.Random; 29 29 30 30 namespace HeuristicLab.Algorithms.MOCMAEvolutionStrategy { 31 [Storable Class]31 [StorableType("8D5AF328-84A0-4924-9909-A113CDCFC117")] 32 32 public class Individual : IDeepCloneable { 33 33 … … 63 63 #region Constructors and Cloning 64 64 [StorableConstructor] 65 protected Individual( bool deserializing) { }65 protected Individual(StorableConstructorFlag _) { } 66 66 67 67 public Individual(RealVector mean, double pSucc, double sigma, RealVector pc, double[,] c, MOCMAEvolutionStrategy strategy) { -
branches/2521_ProblemRefactoring/HeuristicLab.Algorithms.MOCMAEvolutionStrategy/3.3/MOCMAEvolutionStrategy.cs
r15583 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * and the BEACON Center for the Study of Evolution in Action. 5 5 * … … 32 32 using HeuristicLab.Optimization; 33 33 using HeuristicLab.Parameters; 34 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;34 using HEAL.Attic; 35 35 using HeuristicLab.Problems.TestFunctions.MultiObjective; 36 36 using HeuristicLab.Random; … … 39 39 [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")] 40 40 [Creatable(CreatableAttribute.Categories.PopulationBasedAlgorithms, Priority = 210)] 41 [Storable Class]41 [StorableType("C10264E3-E4C6-4735-8E94-0DC116E8908D")] 42 42 public class MOCMAEvolutionStrategy : BasicAlgorithm { 43 43 public override Type ProblemType { … … 265 265 266 266 [StorableConstructor] 267 protected MOCMAEvolutionStrategy( bool deserializing) : base(deserializing) { }267 protected MOCMAEvolutionStrategy(StorableConstructorFlag _) : base(_) { } 268 268 269 269 protected MOCMAEvolutionStrategy(MOCMAEvolutionStrategy original, Cloner cloner) : base(original, cloner) { … … 285 285 #region Initialization 286 286 protected override void Initialize(CancellationToken cancellationToken) { 287 if (SetSeedRandomly) Seed = new System.Random().Next();287 if (SetSeedRandomly) Seed = RandomSeedGenerator.GetSeed(); 288 288 random.Reset(Seed); 289 289 gauss = new NormalDistributedRandom(random, 0, 1); -
branches/2521_ProblemRefactoring/HeuristicLab.Algorithms.MOCMAEvolutionStrategy/3.3/Plugin.cs.frame
r15589 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 37 37 [PluginDependency("HeuristicLab.Optimization", "3.3")] 38 38 [PluginDependency("HeuristicLab.Parameters", "3.3")] 39 [PluginDependency("HeuristicLab. Persistence", "3.3")]39 [PluginDependency("HeuristicLab.Attic", "1.0")] 40 40 [PluginDependency("HeuristicLab.Problems.TestFunctions.MultiObjective", "3.3")] 41 41 [PluginDependency("HeuristicLab.Random", "3.3")] -
branches/2521_ProblemRefactoring/HeuristicLab.Algorithms.MOCMAEvolutionStrategy/3.3/Properties/AssemblyInfo.cs.frame
r15589 r16723 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab.
Note: See TracChangeset
for help on using the changeset viewer.