Changeset 12992
- Timestamp:
- 10/09/15 13:47:46 (9 years ago)
- Location:
- branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3
- Files:
-
- 1 deleted
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3/AlpsGeneticAlgorithm.cs
r12570 r12992 41 41 public sealed class AlpsGeneticAlgorithm : Alps { 42 42 #region Parameter Properties 43 private IValueParameter<Int Array> PopulationSizeParameter {44 get { return (IValueParameter<Int Array>)Parameters["PopulationSize"]; }43 private IValueParameter<IntValue> PopulationSizeParameter { 44 get { return (IValueParameter<IntValue>)Parameters["PopulationSize"]; } 45 45 } 46 46 public IConstrainedValueParameter<ISelector> SelectorParameter { … … 68 68 69 69 #region Properties 70 public Int ArrayPopulationSize {70 public IntValue PopulationSize { 71 71 get { return PopulationSizeParameter.Value; } 72 72 set { PopulationSizeParameter.Value = value; } … … 130 130 public AlpsGeneticAlgorithm() 131 131 : base() { 132 Parameters.Add(new ValueParameter<Int Array>("PopulationSize", "The size of the population of solutions each layer.", new IntArray(new[] { 100 })));132 Parameters.Add(new ValueParameter<IntValue>("PopulationSize", "The size of the population of solutions each layer.", new IntValue(100))); 133 133 Parameters.Add(new ConstrainedValueParameter<ISelector>("Selector", "The operator used to select solutions for reproduction.")); 134 134 Parameters.Add(new ConstrainedValueParameter<ICrossover>("Crossover", "The operator used to cross solutions.")); … … 141 141 var globalRandomCreator = new RandomCreator(); 142 142 var layer0Creator = new SubScopesCreator() { Name = "Create Layer Zero" }; 143 var layer0Processor = new LayerUniformSubScopesProcessor();143 var layer0Processor = new UniformSubScopesProcessor(); 144 144 var localRandomCreator = new LocalRandomCreator(); 145 145 var layerVariableCreator = new VariableCreator(); -
branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3/AlpsGeneticAlgorithmMainLoop.cs
r12531 r12992 90 90 var matingPoolPreSorter = new SubScopesSorter() { Name = "MatingPoolPreSorter" }; 91 91 var matingPoolCreator = new MatingPoolCreator() { Name = "Create Mating Pools" }; 92 var matingPoolProcessor = new LayerUniformSubScopesProcessor();92 var matingPoolProcessor = new UniformSubScopesProcessor(); 93 93 var initializeLayer = new Assigner() { Name = "Reset LayerEvaluatedSolutions" }; 94 94 var mainOperator = CreatePreparedGeneticAlgorithmMainLoop(); … … 97 97 var eldersEmigrator = new EldersEmigrator() { Name = "Emigrate Elders" }; 98 98 var layerUpdator = new LayerUpdator(mainOperator) { Name = "Update Layers" }; 99 var layerAnalyzerProcessor = new LayerUniformSubScopesProcessor();99 var layerAnalyzerProcessor = new UniformSubScopesProcessor(); 100 100 var layerAnalyzerPlaceholder = new Placeholder() { Name = "LayerAnalyzer (Placeholder)" }; 101 101 var analyzerPlaceholder = new Placeholder() { Name = "Analyzer (Placeholder)" }; -
branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3/EldersEmigrator.cs
r12092 r12992 46 46 var eldersSelector = new EldersSelector(); 47 47 var shiftToRightMigrator = new ShiftToRightMigrator(); 48 var mergingProsessor = new LayerUniformSubScopesProcessor();48 var mergingProsessor = new UniformSubScopesProcessor(); 49 49 var mergingReducer = new MergingReducer(); 50 50 var subScopesCounter = new SubScopesCounter(); -
branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3/HeuristicLab.Algorithms.ALPS-3.3.csproj
r12863 r12992 145 145 <Compile Include="LayerCreator.cs" /> 146 146 <Compile Include="LayerSorter.cs" /> 147 <Compile Include="LayerUniformSubScopesProcessor.cs" />148 147 <Compile Include="LayerUpdator.cs" /> 149 148 <Compile Include="MatingPoolCreator.cs" /> -
branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3/LayerUpdator.cs
r12570 r12992 62 62 var newLayerSelector = new RightSelector(); 63 63 var newLayerProsessor = new SubScopesProcessor() { Name = "NewLayerProcessor" }; 64 var newLayerLayerProcessor = new LayerUniformSubScopesProcessor();64 var newLayerLayerProcessor = new UniformSubScopesProcessor(); 65 65 var newLayerReducer = new MergingReducer(); 66 66 var layerInitializer = new Assigner() { Name = "Init Layer" }; … … 71 71 var regenerateLayerZeroSelector = new LeftSelector(); 72 72 var regenerateLayerZeroProsessor = new SubScopesProcessor() { Name = "LayerZeroProcessor" }; 73 var regenerateLayerZeroLayerProsessor = new LayerUniformSubScopesProcessor();73 var regenerateLayerZeroLayerProsessor = new UniformSubScopesProcessor(); 74 74 var regenerateLayerZeroReducer = new MergingReducer(); 75 75 var layerSorter = new LayerSorter();
Note: See TracChangeset
for help on using the changeset viewer.