Changeset 11203 for branches/HiveStatistics/sources/HeuristicLab.Algorithms.RAPGA/3.3/RAPGAMainLoop.cs
- Timestamp:
- 07/18/14 12:35:00 (10 years ago)
- Location:
- branches/HiveStatistics/sources
- Files:
-
- 2 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.RAPGA/3.3/RAPGAMainLoop.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. … … 65 65 get { return (ValueLookupParameter<IntValue>)Parameters["Elites"]; } 66 66 } 67 public IValueLookupParameter<BoolValue> ReevaluateElitesParameter {68 get { return (IValueLookupParameter<BoolValue>)Parameters["ReevaluateElites"]; }69 }70 67 public ValueLookupParameter<IntValue> MaximumGenerationsParameter { 71 68 get { return (ValueLookupParameter<IntValue>)Parameters["MaximumGenerations"]; } … … 119 116 public override IDeepCloneable Clone(Cloner cloner) { 120 117 return new RAPGAMainLoop(this, cloner); 121 }122 123 [StorableHook(HookType.AfterDeserialization)]124 private void AfterDeserialization() {125 // BackwardsCompatibility3.3126 #region Backwards compatible code, remove with 3.4127 if (!Parameters.ContainsKey("ReevaluateElites")) {128 Parameters.Add(new ValueLookupParameter<BoolValue>("ReevaluateElites", "Flag to determine if elite individuals should be reevaluated (i.e., if stochastic fitness functions are used.)"));129 }130 #endregion131 118 } 132 119 … … 142 129 Parameters.Add(new ValueLookupParameter<IOperator>("Evaluator", "The operator used to evaluate solutions. This operator is executed in parallel, if an engine is used which supports parallelization.")); 143 130 Parameters.Add(new ValueLookupParameter<IntValue>("Elites", "The numer of elite solutions which are kept in each generation.")); 144 Parameters.Add(new ValueLookupParameter<BoolValue>("ReevaluateElites", "Flag to determine if elite individuals should be reevaluated (i.e., if stochastic fitness functions are used.)"));145 131 Parameters.Add(new ValueLookupParameter<IntValue>("MaximumGenerations", "The maximum number of generations which should be processed.")); 146 132 Parameters.Add(new ValueLookupParameter<VariableCollection>("Results", "The variable collection where results should be stored.")); … … 204 190 Assigner assigner4 = new Assigner(); 205 191 Assigner assigner5 = new Assigner(); 206 ConditionalBranch reevaluateElitesBranch = new ConditionalBranch();207 UniformSubScopesProcessor uniformSubScopesProcessor2 = new UniformSubScopesProcessor();208 Placeholder evaluator2 = new Placeholder();209 SubScopesCounter subScopesCounter4 = new SubScopesCounter();210 192 211 193 variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("Generations", new IntValue(0))); // Class RAPGA expects this to be called Generations … … 356 338 assigner5.LeftSideParameter.ActualName = "OffspringList"; 357 339 assigner5.RightSideParameter.Value = new ScopeList(); 358 359 reevaluateElitesBranch.ConditionParameter.ActualName = "ReevaluateElites";360 reevaluateElitesBranch.Name = "Reevaluate elites ?";361 362 uniformSubScopesProcessor2.Parallel.Value = true;363 364 evaluator2.Name = "Evaluator (placeholder)";365 evaluator2.OperatorParameter.ActualName = EvaluatorParameter.Name;366 367 subScopesCounter4.Name = "Increment EvaluatedSolutions";368 subScopesCounter4.ValueParameter.ActualName = EvaluatedSolutionsParameter.Name;369 340 #endregion 370 341 … … 407 378 subScopesProcessor2.Successor = mergingReducer; 408 379 bestSelector.Successor = rightReducer2; 409 rightReducer2.Successor = reevaluateElitesBranch; 410 reevaluateElitesBranch.TrueBranch = uniformSubScopesProcessor2; 411 uniformSubScopesProcessor2.Operator = evaluator2; 412 uniformSubScopesProcessor2.Successor = subScopesCounter4; 413 evaluator2.Successor = null; 414 subScopesCounter4.Successor = null; 415 reevaluateElitesBranch.FalseBranch = null; 416 reevaluateElitesBranch.Successor = null; 380 rightReducer2.Successor = null; 417 381 scopeCleaner.Successor = scopeRestorer; 418 382 mergingReducer.Successor = intCounter3;
Note: See TracChangeset
for help on using the changeset viewer.