Changeset 12138 for branches/ALPS/HeuristicLab.Algorithms.ALPS.SteadyState/3.3/AlpsSsGeneticAlgorithmMainLoop.cs
- Timestamp:
- 03/05/15 13:35:38 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/ALPS/HeuristicLab.Algorithms.ALPS.SteadyState/3.3/AlpsSsGeneticAlgorithmMainLoop.cs
r12136 r12138 20 20 #endregion 21 21 22 using System.Linq; 22 23 using HeuristicLab.Common; 23 24 using HeuristicLab.Core; 24 25 using HeuristicLab.Data; 25 26 using HeuristicLab.Operators; 27 using HeuristicLab.Optimization; 26 28 using HeuristicLab.Optimization.Operators; 27 29 using HeuristicLab.Parameters; … … 88 90 var matingPoolSizeMin2 = new Comparator() { Name = "ValidParents = MatingPoolSize >= 2" }; 89 91 var validParentsBranch = new ConditionalBranch() { Name = "ValidParents?" }; 90 var mainOperator = new EmptyOperator(); // TODO92 var mainOperator = new AlpsSsGeneticAlgorithmMainOperator(); 91 93 var reactivateInit = new Assigner() { Name = "DoInit = true" }; 92 94 var resetNextIndex = new Assigner() { Name = "NextInit = 1" }; … … 94 96 var clearMatingPool = new SubScopesRemover() { Name = "Clear WorkingScope" }; 95 97 var tryMoveUp = new EmptyOperator() { Name = "Try Move Up" }; // TODO 96 var setNewIndividual = new EmptyOperator() { Name = "Set New Individual" }; 98 var setNewIndividual = new EmptyOperator() { Name = "Set New Individual" }; // TODO 99 var incrIterations = new IntCounter() { Name = "Incr. Iterations" }; 100 var analyzer = new Placeholder() { Name = "Analyzer (Placeholder)" }; 97 101 var iterationsComparator = new Comparator() { Name = "Iterations >= MaximumIterations" }; 98 102 var terminateBranch = new ConditionalBranch() { Name = "Terminate?" }; … … 105 109 variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("OpenLayers", new IntValue(1))); 106 110 variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("TargetIndex", new IntValue(0))); 111 variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("Iterations")); 107 112 variableCreator.Successor = randomScopeProcessor; 108 113 … … 176 181 matingPoolSizeMin2.Successor = validParentsBranch; 177 182 183 validParentsBranch.ConditionParameter.ActualName = "ValidParents"; 178 184 validParentsBranch.TrueBranch = mainOperator; 179 185 validParentsBranch.FalseBranch = reactivateInit; … … 195 201 tryMoveUp.Successor = setNewIndividual; 196 202 197 setNewIndividual.Successor = iterationsComparator; 203 setNewIndividual.Successor = incrIterations; 204 205 incrIterations.ValueParameter.ActualName = "Iterations"; 206 incrIterations.Increment = new IntValue(1); 207 incrIterations.Successor = analyzer; 208 209 analyzer.OperatorParameter.ActualName = "Analyzer"; 210 analyzer.Successor = iterationsComparator; 198 211 199 212 iterationsComparator.Comparison = new Comparison(ComparisonType.GreaterOrEqual); … … 205 218 terminateBranch.ConditionParameter.ActualName = "Terminate"; 206 219 terminateBranch.FalseBranch = randomScopeProcessor; 207 208 209 } 210 220 } 211 221 } 212 222 }
Note: See TracChangeset
for help on using the changeset viewer.