- Timestamp:
- 07/18/14 12:35:00 (10 years ago)
- Location:
- branches/HiveStatistics/sources
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HiveStatistics/sources
- Property svn:ignore
-
old new 8 8 FxCopResults.txt 9 9 Google.ProtocolBuffers-0.9.1.dll 10 Google.ProtocolBuffers-2.4.1.473.dll11 10 HeuristicLab 3.3.5.1.ReSharper.user 12 11 HeuristicLab 3.3.6.0.ReSharper.user 13 12 HeuristicLab.4.5.resharper.user 14 13 HeuristicLab.ExtLibs.6.0.ReSharper.user 15 HeuristicLab.Scripting.Development16 14 HeuristicLab.resharper.user 17 15 ProtoGen.exe … … 19 17 _ReSharper.HeuristicLab 20 18 _ReSharper.HeuristicLab 3.3 21 _ReSharper.HeuristicLab 3.3 Tests22 19 _ReSharper.HeuristicLab.ExtLibs 23 20 bin 24 21 protoc.exe 22 _ReSharper.HeuristicLab 3.3 Tests 23 Google.ProtocolBuffers-2.4.1.473.dll
-
- Property svn:mergeinfo changed
- Property svn:ignore
-
branches/HiveStatistics/sources/HeuristicLab.Algorithms.EvolutionStrategy/3.3/EvolutionStrategyMainLoop.cs
r11202 r11203 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 61 61 get { return (ValueLookupParameter<BoolValue>)Parameters["PlusSelection"]; } 62 62 } 63 public IValueLookupParameter<BoolValue> ReevaluateElitesParameter {64 get { return (IValueLookupParameter<BoolValue>)Parameters["ReevaluateElites"]; }65 }66 63 public ValueLookupParameter<IntValue> MaximumGenerationsParameter { 67 64 get { return (ValueLookupParameter<IntValue>)Parameters["MaximumGenerations"]; } … … 111 108 : base() { 112 109 Initialize(); 113 }114 115 [StorableHook(HookType.AfterDeserialization)]116 private void AfterDeserialization() {117 // BackwardsCompatibility3.3118 #region Backwards compatible code, remove with 3.4119 if (!Parameters.ContainsKey("ReevaluateElites")) {120 Parameters.Add(new ValueLookupParameter<BoolValue>("ReevaluateElites", "Flag to determine if elite individuals should be reevaluated (i.e., if stochastic fitness functions are used.)"));121 }122 #endregion123 110 } 124 111 … … 134 121 Parameters.Add(new ValueLookupParameter<IntValue>("MaximumGenerations", "The maximum number of generations which should be processed.")); 135 122 Parameters.Add(new ValueLookupParameter<BoolValue>("PlusSelection", "True for plus selection (elitist population), false for comma selection (non-elitist population).")); 136 Parameters.Add(new ValueLookupParameter<BoolValue>("ReevaluateElites", "Flag to determine if elite individuals should be reevaluated (i.e., if stochastic fitness functions are used.)"));137 123 Parameters.Add(new ValueLookupParameter<IOperator>("Mutator", "The operator used to mutate solutions.")); 138 124 Parameters.Add(new ValueLookupParameter<IOperator>("Recombinator", "The operator used to cross solutions.")); … … 176 162 Placeholder analyzer2 = new Placeholder(); 177 163 ConditionalBranch conditionalBranch = new ConditionalBranch(); 178 ConditionalBranch reevaluateElitesBranch = new ConditionalBranch();179 SubScopesProcessor subScopesProcessor2 = new SubScopesProcessor();180 UniformSubScopesProcessor uniformSubScopesProcessor4 = new UniformSubScopesProcessor();181 Placeholder evaluator2 = new Placeholder();182 SubScopesCounter subScopesCounter2 = new SubScopesCounter();183 184 164 185 165 variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("Generations", new IntValue(0))); // Class EvolutionStrategy expects this to be called Generations … … 255 235 256 236 conditionalBranch.ConditionParameter.ActualName = "Terminate"; 257 258 reevaluateElitesBranch.ConditionParameter.ActualName = "ReevaluateElites";259 reevaluateElitesBranch.Name = "Reevaluate elites ?";260 261 uniformSubScopesProcessor4.Parallel.Value = true;262 263 evaluator2.Name = "Evaluator (placeholder)";264 evaluator2.OperatorParameter.ActualName = EvaluatorParameter.Name;265 266 subScopesCounter2.Name = "Increment EvaluatedSolutions";267 subScopesCounter2.ValueParameter.ActualName = EvaluatedSolutionsParameter.Name;268 237 #endregion 269 238 … … 297 266 evaluator.Successor = null; 298 267 subScopesCounter.Successor = null; 299 300 plusOrCommaReplacementBranch.TrueBranch = reevaluateElitesBranch; 301 reevaluateElitesBranch.TrueBranch = subScopesProcessor2; 302 reevaluateElitesBranch.FalseBranch = null; 303 subScopesProcessor2.Operators.Add(uniformSubScopesProcessor4); 304 subScopesProcessor2.Operators.Add(new EmptyOperator()); 305 uniformSubScopesProcessor4.Operator = evaluator2; 306 uniformSubScopesProcessor4.Successor = subScopesCounter2; 307 subScopesCounter2.Successor = null; 308 reevaluateElitesBranch.Successor = plusReplacement; 309 268 plusOrCommaReplacementBranch.TrueBranch = plusReplacement; 310 269 plusOrCommaReplacementBranch.FalseBranch = commaReplacement; 311 270 plusOrCommaReplacementBranch.Successor = bestSelector; -
branches/HiveStatistics/sources/HeuristicLab.Algorithms.EvolutionStrategy/3.3/Plugin.cs.frame
r11202 r11203 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 26 26 /// Plugin class for HeuristicLab.Algorithms.EvolutionStrategy plugin. 27 27 /// </summary> 28 [Plugin("HeuristicLab.Algorithms.EvolutionStrategy", "3.3. 10.$WCREV$")]28 [Plugin("HeuristicLab.Algorithms.EvolutionStrategy", "3.3.7.$WCREV$")] 29 29 [PluginFile("HeuristicLab.Algorithms.EvolutionStrategy-3.3.dll", PluginFileType.Assembly)] 30 30 [PluginDependency("HeuristicLab.Analysis", "3.3")] -
branches/HiveStatistics/sources/HeuristicLab.Algorithms.EvolutionStrategy/3.3/Properties/AssemblyInfo.cs.frame
r11202 r11203 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 31 31 [assembly: AssemblyCompany("")] 32 32 [assembly: AssemblyProduct("HeuristicLab")] 33 [assembly: AssemblyCopyright("(c) 2002-201 4HEAL")]33 [assembly: AssemblyCopyright("(c) 2002-2012 HEAL")] 34 34 [assembly: AssemblyTrademark("")] 35 35 [assembly: AssemblyCulture("")] … … 53 53 // by using the '*' as shown below: 54 54 [assembly: AssemblyVersion("3.3.0.0")] 55 [assembly: AssemblyFileVersion("3.3. 10.$WCREV$")]55 [assembly: AssemblyFileVersion("3.3.7.$WCREV$")] -
branches/HiveStatistics/sources/HeuristicLab.Algorithms.EvolutionStrategy/3.3/SelfAdaptiveCrossover.cs
r11202 r11203 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/HiveStatistics/sources/HeuristicLab.Algorithms.EvolutionStrategy/3.3/StrategyVectorManipulator.cs
r11202 r11203 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/HiveStatistics/sources/HeuristicLab.Algorithms.EvolutionStrategy/3.3/WithoutRepeatingBatchedRandomSelector.cs
r11202 r11203 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 4Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2012 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.