- Timestamp:
- 03/28/19 16:54:20 (6 years ago)
- Location:
- branches/2521_ProblemRefactoring
- Files:
-
- 15 edited
- 1 copied
Legend:
- Unmodified
- Added
- Removed
-
branches/2521_ProblemRefactoring
- Property svn:mergeinfo changed
-
branches/2521_ProblemRefactoring/HeuristicLab.Random
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/branches/2520_PersistenceReintegration/HeuristicLab.Random merged eligible /branches/2839_HiveProjectManagement/HeuristicLab.Random merged eligible /branches/2947_ConfigurableIndexedDataTable/HeuristicLab.Random merged eligible /branches/2965_CancelablePersistence/HeuristicLab.Random merged eligible /branches/2972_PDPRowSelect/HeuristicLab.Random merged eligible /stable/HeuristicLab.Random merged eligible /trunk/HeuristicLab.Random merged eligible /branches/1721-RandomForestPersistence/HeuristicLab.Random 10321-10322 /branches/2892_LR-prediction-intervals/HeuristicLab.Random 15743-16388 /branches/2915-AbsoluteSymbol/HeuristicLab.Random 15943-16355 /branches/Algorithms.GradientDescent/HeuristicLab.Random 5516-5520 /branches/Benchmarking/sources/HeuristicLab.Random 6917-7005 /branches/CloningRefactoring/HeuristicLab.Random 4656-4721 /branches/CodeEditor/HeuristicLab.Random 11700-11806 /branches/DataAnalysis Refactoring/HeuristicLab.Random 5471-5808 /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Random 5815-6180 /branches/DataAnalysis/HeuristicLab.Random 4458-4459,4462,4464 /branches/DataPreprocessing/HeuristicLab.Random 10085-11101 /branches/GP.Grammar.Editor/HeuristicLab.Random 6284-6795 /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Random 5060 /branches/HLScript/HeuristicLab.Random 10331-10358 /branches/HeuristicLab.DatasetRefactor/sources/HeuristicLab.Random 11570-12508 /branches/HeuristicLab.Problems.DataAnalysis.Trading/HeuristicLab.Random 6123-9799 /branches/HeuristicLab.Problems.Orienteering/HeuristicLab.Random 11130-12721 /branches/HiveStatistics/sources/HeuristicLab.Random 12440-12877 /branches/LogResidualEvaluator/HeuristicLab.Random 10202-10483 /branches/NET40/sources/HeuristicLab.Random 5138-5162 /branches/NSGA-II Changes/HeuristicLab.Random 12033-12122 /branches/ParallelEngine/HeuristicLab.Random 5175-5192 /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Random 7568-7810 /branches/QAPAlgorithms/HeuristicLab.Random 6350-6627 /branches/Restructure trunk solution/HeuristicLab.Random 6828 /branches/RuntimeOptimizer/HeuristicLab.Random 8943-9078 /branches/ScatterSearch (trunk integration)/HeuristicLab.Random 7787-8333 /branches/SlaveShutdown/HeuristicLab.Random 8944-8956 /branches/SpectralKernelForGaussianProcesses/HeuristicLab.Random 10204-10479 /branches/SuccessProgressAnalysis/HeuristicLab.Random 5370-5682 /branches/Trunk/HeuristicLab.Random 6829-6865 /branches/UnloadJobs/HeuristicLab.Random 9168-9215 /branches/VNS/HeuristicLab.Random 5594-5752 /branches/crossvalidation-2434/HeuristicLab.Random 12948-12950 /branches/histogram/HeuristicLab.Random 5959-6341
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2521_ProblemRefactoring/HeuristicLab.Random/3.3/FastRandom.cs
r8928 r16723 2 2 using HeuristicLab.Common; 3 3 using HeuristicLab.Core; 4 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;4 using HEAL.Attic; 5 5 6 6 namespace HeuristicLab.Random { … … 43 43 /// 44 44 /// </summary> 45 [Storable Class]45 [StorableType("BC86BFF3-80B5-4C77-9D8C-B29576032634")] 46 46 public sealed class FastRandom : Item, IRandom { 47 47 // The +1 ensures NextDouble doesn't generate 1.0 … … 59 59 /// <param name="deserializing">true, if the constructor is called during deserialization.</param> 60 60 [StorableConstructor] 61 private FastRandom( bool deserializing) : base(deserializing) { }61 private FastRandom(StorableConstructorFlag _) : base(_) { } 62 62 63 63 /// <summary> -
branches/2521_ProblemRefactoring/HeuristicLab.Random/3.3/GammaDistributedRandom.cs
r16692 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.Common; 24 24 using HeuristicLab.Core; 25 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;25 using HEAL.Attic; 26 26 using HeuristicLab.Random; 27 27 … … 33 33 /// </summary> 34 34 [Item("GammaDistributedRandom", "A pseudo random number generator for gamma distributed random numbers.")] 35 [Storable Class]35 [StorableType("5DA8921C-5026-4B20-9F64-2C6EF0BF8B33")] 36 36 public sealed class GammaDistributedRandom : Item, IRandom { 37 37 [Storable] … … 63 63 64 64 [StorableConstructor] 65 private GammaDistributedRandom( bool deserializing) : base(deserializing) { }65 private GammaDistributedRandom(StorableConstructorFlag _) : base(_) { } 66 66 67 67 private GammaDistributedRandom(GammaDistributedRandom original, Cloner cloner) : base(original, cloner) { -
branches/2521_ProblemRefactoring/HeuristicLab.Random/3.3/HeuristicLab.Random-3.3.csproj
r16692 r16723 18 18 <UpgradeBackupLocation> 19 19 </UpgradeBackupLocation> 20 <TargetFrameworkVersion>v4. 5</TargetFrameworkVersion>20 <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> 21 21 <TargetFrameworkProfile> 22 22 </TargetFrameworkProfile> … … 120 120 <Compile Include="GammaDistributedRandom.cs" /> 121 121 <Compile Include="ListExtensions.cs" /> 122 <Compile Include="RandomSeedGenerator.cs" /> 122 123 <Compile Include="UniformDistributedRandom.cs" /> 123 124 <Compile Include="FastRandom.cs" /> … … 197 198 <Install>true</Install> 198 199 </BootstrapperPackage> 200 </ItemGroup> 201 <ItemGroup> 202 <Reference Include="HEAL.Attic, Version=1.0.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL"> 203 <SpecificVersion>False</SpecificVersion> 204 <HintPath>..\..\bin\HEAL.Attic.dll</HintPath> 205 <Private>False</Private> 206 </Reference> 199 207 </ItemGroup> 200 208 <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> -
branches/2521_ProblemRefactoring/HeuristicLab.Random/3.3/ListExtensions.cs
r16692 r16723 2 2 3 3 /* HeuristicLab 4 * Copyright (C) 2002-201 8Heuristic and Evolutionary Algorithms Laboratory (HEAL)4 * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 5 5 * 6 6 * This file is part of HeuristicLab. -
branches/2521_ProblemRefactoring/HeuristicLab.Random/3.3/MersenneTwister.cs
r16692 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. … … 35 35 using HeuristicLab.Common; 36 36 using HeuristicLab.Core; 37 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;37 using HEAL.Attic; 38 38 39 39 namespace HeuristicLab.Random { … … 42 42 /// </summary> 43 43 [Item("MersenneTwister", "A high-quality pseudo random number generator which creates uniformly distributed random numbers.")] 44 [Storable Class]44 [StorableType("107BE400-46D0-4CD6-BE80-46F40B6AB148")] 45 45 public sealed class MersenneTwister : Item, IRandom { 46 46 private const int n = 624, m = 397; … … 59 59 /// <param name="deserializing">true, if the constructor is called during deserialization.</param> 60 60 [StorableConstructor] 61 private MersenneTwister( bool deserializing) : base(deserializing) { }61 private MersenneTwister(StorableConstructorFlag _) : base(_) { } 62 62 /// <summary> 63 63 /// Initializes a new instance from an existing one (copy constructor). -
branches/2521_ProblemRefactoring/HeuristicLab.Random/3.3/NormalDistributedRandom.cs
r16692 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.Common; 24 24 using HeuristicLab.Core; 25 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;25 using HEAL.Attic; 26 26 27 27 namespace HeuristicLab.Random { … … 33 33 /// </summary> 34 34 [Item("NormalDistributedRandom", "A pseudo random number generator which uses the Ziggurat method to create normally distributed random numbers.")] 35 [Storable Class]35 [StorableType("240F7050-C05B-4E85-82C3-2871FE2138B1")] 36 36 public sealed class NormalDistributedRandom : Item, IRandom { 37 37 [Storable] … … 454 454 /// <param name="deserializing">true, if the constructor is called during deserialization.</param> 455 455 [StorableConstructor] 456 private NormalDistributedRandom( bool deserializing) : base(deserializing) { }456 private NormalDistributedRandom(StorableConstructorFlag _) : base(_) { } 457 457 458 458 /// <summary> -
branches/2521_ProblemRefactoring/HeuristicLab.Random/3.3/NormalRandomizer.cs
r16692 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. … … 25 25 using HeuristicLab.Operators; 26 26 using HeuristicLab.Parameters; 27 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;27 using HEAL.Attic; 28 28 29 29 namespace HeuristicLab.Random { … … 31 31 /// Normally distributed random number generator. 32 32 /// </summary> 33 [Storable Class]33 [StorableType("0EAF4184-6C98-4C9D-80A1-09A42E03450E")] 34 34 [Item("NormalRandomizer", "Initializes the value of variable 'Value' to a random value normally distributed with parameters 'Mu' and 'Sigma'")] 35 35 public class NormalRandomizer : SingleSuccessorOperator { … … 61 61 62 62 [StorableConstructor] 63 protected NormalRandomizer( bool deserializing) : base(deserializing) { }63 protected NormalRandomizer(StorableConstructorFlag _) : base(_) { } 64 64 protected NormalRandomizer(NormalRandomizer original, Cloner cloner) : base(original, cloner) { } 65 65 /// <summary> -
branches/2521_ProblemRefactoring/HeuristicLab.Random/3.3/Plugin.cs.frame
r16692 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. … … 34 34 [PluginDependency("HeuristicLab.Operators", "3.3")] 35 35 [PluginDependency("HeuristicLab.Parameters", "3.3")] 36 [PluginDependency("HeuristicLab. Persistence", "3.3")]36 [PluginDependency("HeuristicLab.Attic", "1.0")] 37 37 public class HeuristicLabRandomPlugin : PluginBase { 38 38 } -
branches/2521_ProblemRefactoring/HeuristicLab.Random/3.3/Properties/AssemblyInfo.cs.frame
r16692 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. -
branches/2521_ProblemRefactoring/HeuristicLab.Random/3.3/RandomCreator.cs
r16692 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. … … 25 25 using HeuristicLab.Operators; 26 26 using HeuristicLab.Parameters; 27 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;27 using HEAL.Attic; 28 28 29 29 namespace HeuristicLab.Random { … … 32 32 /// </summary> 33 33 [Item("RandomCreator", "An operator which creates a new Mersenne Twister pseudo random number generator.")] 34 [Storable Class]34 [StorableType("78A995DA-CE6C-4693-A494-6ABBF1849CEB")] 35 35 public sealed class RandomCreator : SingleSuccessorOperator { 36 36 #region Parameter Properties … … 65 65 66 66 [StorableConstructor] 67 private RandomCreator( bool deserializing) : base(deserializing) { }67 private RandomCreator(StorableConstructorFlag _) : base(_) { } 68 68 private RandomCreator(RandomCreator original, Cloner cloner) : base(original, cloner) { } 69 69 public RandomCreator() … … 94 94 IntValue seed = SeedParameter.ActualValue; 95 95 96 if (setSeedRandomly) seed.Value = new System.Random().Next();96 if (setSeedRandomly) seed.Value = RandomSeedGenerator.GetSeed(); 97 97 IRandom random = (IRandom)RandomType.Clone(); 98 98 random.Reset(seed.Value); -
branches/2521_ProblemRefactoring/HeuristicLab.Random/3.3/RandomEnumerable.cs
r16692 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. … … 202 202 var cur = list.First; 203 203 double ball = cur.Value.Item2, sum = random.NextDouble() * total; // assert: sum < total. When there is only one item remaining: sum < ball 204 while (ball < sum ) {204 while (ball < sum && cur.Next != null) { 205 205 cur = cur.Next; 206 206 ball += cur.Value.Item2; -
branches/2521_ProblemRefactoring/HeuristicLab.Random/3.3/UniformDistributedRandom.cs
r16692 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.Common; 24 24 using HeuristicLab.Core; 25 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;25 using HEAL.Attic; 26 26 27 27 namespace HeuristicLab.Random { … … 31 31 /// </summary> 32 32 [Item("UniformDistributedRandom", "A pseudo random number generator to create uniform distributed random numbers.")] 33 [Storable Class]33 [StorableType("01239E33-7AAD-467A-A95C-6D7E001F5827")] 34 34 public sealed class UniformDistributedRandom : Item, IRandom { 35 35 [Storable] … … 61 61 /// <param name="deserializing">true, if the constructor is called during deserialization.</param> 62 62 [StorableConstructor] 63 private UniformDistributedRandom( bool deserializing) : base(deserializing) { }63 private UniformDistributedRandom(StorableConstructorFlag _) : base(_) { } 64 64 65 65 /// <summary> -
branches/2521_ProblemRefactoring/HeuristicLab.Random/3.3/UniformRandomizer.cs
r16692 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. … … 25 25 using HeuristicLab.Operators; 26 26 using HeuristicLab.Parameters; 27 using H euristicLab.Persistence.Default.CompositeSerializers.Storable;27 using HEAL.Attic; 28 28 29 29 namespace HeuristicLab.Random { … … 31 31 /// Uniformly distributed random number generator. 32 32 /// </summary> 33 [Storable Class]33 [StorableType("427A6E3A-EC49-4513-9773-768E78F583BF")] 34 34 [Item("UniformRandomizer", "Initializes the value of variable 'Value' to a random value uniformly distributed between 'Min' and 'Max'")] 35 35 public class UniformRandomizer : SingleSuccessorOperator { … … 61 61 62 62 [StorableConstructor] 63 protected UniformRandomizer( bool deserializing) : base(deserializing) { }63 protected UniformRandomizer(StorableConstructorFlag _) : base(_) { } 64 64 protected UniformRandomizer(UniformRandomizer original, Cloner cloner) : base(original, cloner) { } 65 65 /// <summary>
Note: See TracChangeset
for help on using the changeset viewer.