Changeset 12142 for branches

Timestamp:

03/05/15 15:35:15 (10 years ago)

Author:

pfleck

Message:

#2350

• Changed PopulationSize parameter to IntValue.
• Implemented TryMoveUp procedure in AlpsSsMover.

Location:

branches/ALPS/HeuristicLab.Algorithms.ALPS.SteadyState/3.3

Files:

• AlpsSsGeneticAlgorithm.cs (modified) (4 diffs)
• AlpsSsGeneticAlgorithmMainLoop.cs (modified) (5 diffs)
• AlpsSsMover.cs (added)
• HeuristicLab.Algorithms.ALPS.SteadyState-3.3.csproj (modified) (1 diff)
• RandomLayerProcessor.cs (modified) (3 diffs)

branches/ALPS/HeuristicLab.Algorithms.ALPS.SteadyState/3.3/AlpsSsGeneticAlgorithm.cs

@@ -40 +40 @@
   public class AlpsSsGeneticAlgorithm : Alps {
     #region Parameter Properties
-    private IValueParameter<IntArray> PopulationSizeParameter {
-      get { return (IValueParameter<IntArray>)Parameters["PopulationSize"]; }
+    private IValueParameter<IntValue> PopulationSizeParameter {
+      get { return (IValueParameter<IntValue>)Parameters["PopulationSize"]; }
     }
     private IValueParameter<IntValue> MaximumIterationsParameter {
@@ -67 +67 @@
 
     #region Properties
-    public IntArray PopulationSize {
+    public IntValue PopulationSize {
       get { return PopulationSizeParameter.Value; }
       set { PopulationSizeParameter.Value = value; }
@@ -119 +119 @@
     public AlpsSsGeneticAlgorithm()
       : base() {
-      Parameters.Add(new ValueParameter<IntArray>("PopulationSize", "The size of the population of solutions each layer.", new IntArray(new[] { 100 })));
+      Parameters.Add(new ValueParameter<IntValue>("PopulationSize", "The size of the population of solutions each layer.", new IntValue(100)));
       Parameters.Add(new ValueParameter<IntValue>("MaximumIterations", "The maximum number of iterations that should be processed.", new IntValue(1000)));
       Parameters.Add(new ConstrainedValueParameter<ISelector>("Selector", "The operator used to select solutions for reproduction."));
@@ -131 +131 @@
       var randomCreator = new RandomCreator();
       var layer0Creator = new SubScopesCreator() { Name = "Create Layer Zero" };
-      var layer0Processor = new LayerUniformSubScopesProcessor();
+      var layer0Processor = new /*Layer*/UniformSubScopesProcessor();
       var layer0VariableCreator = new VariableCreator();
       var layer0SolutionsCreator = new SolutionsCreator();

branches/ALPS/HeuristicLab.Algorithms.ALPS.SteadyState/3.3/AlpsSsGeneticAlgorithmMainLoop.cs

@@ -71 +71 @@
 
       var variableCreator = new VariableCreator() { Name = "Initialize" };
-      var randomScopeProcessor = new RandomLayerProcessor() { Name = "Select a layer" }; // TODO LayerSubScopeProcessor for Array conversion
+      var randomScopeProcessor = new RandomLayerProcessor() { Name = "Select a layer" };
       var isLayerZeroComperator = new Comparator() { Name = "IsLayerZero = Layer == 0" };
       var isLayerZeroBranch = new ConditionalBranch() { Name = "IsLayerZero?" };
@@ -95 +95 @@
       var resetTargetIndex = new Assigner() { Name = "TargetIndex = 0" };
       var clearMatingPool = new SubScopesRemover() { Name = "Clear WorkingScope" };
-      var tryMoveUp = new EmptyOperator() { Name = "Try Move Up" }; // TODO
-      var setNewIndividual = new EmptyOperator() { Name = "Set New Individual" }; // TODO
+      var tryMoveUp = new AlpsSsMover() { Name = "Try Move Up" };
+      var removeWorkingScope = new LeftReducer() { Name = "Remove Working Scope" };
       var incrIterations = new IntCounter() { Name = "Incr. Iterations" };
+      var layerAnalyzerProcessor = new UniformSubScopesProcessor();
+      var layerAnalyzer = new Placeholder() { Name = "LayerAnalyzer (Placeholder)" };
       var analyzer = new Placeholder() { Name = "Analyzer (Placeholder)" };
       var iterationsComparator = new Comparator() { Name = "Iterations >= MaximumIterations" };
@@ -109 +111 @@
       variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("OpenLayers", new IntValue(1)));
       variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("TargetIndex", new IntValue(0)));
-      variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("Iterations"));
+      variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("Iterations", new IntValue(0)));
+      variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("MatingPoolSize", new IntValue(0)));
+      variableCreator.CollectedValues.Add(new ValueParameter<BoolValue>("ValidParents", new BoolValue(false)));
       variableCreator.Successor = randomScopeProcessor;
 
@@ -161 +165 @@
       selectRandomTargetIndex.MinimumParameter.Value = new IntValue(0);
       selectRandomTargetIndex.MaximumParameter.ActualName = "PopulationSize";
+      selectRandomTargetIndex.MaximumParameter.Value = null;
       selectRandomTargetIndex.Successor = copyLayer;
 
@@ -199 +204 @@
       clearMatingPool.Successor = createRandomIndividual;
 
-      tryMoveUp.Successor = setNewIndividual;
-
-      setNewIndividual.Successor = incrIterations;
+      tryMoveUp.Successor = removeWorkingScope;
+
+      removeWorkingScope.Successor = incrIterations;
 
       incrIterations.ValueParameter.ActualName = "Iterations";
       incrIterations.Increment = new IntValue(1);
-      incrIterations.Successor = analyzer;
+      incrIterations.Successor = layerAnalyzerProcessor;
+
+      layerAnalyzerProcessor.Operator = layerAnalyzer;
+      layerAnalyzerProcessor.Successor = analyzer;
+
+      layerAnalyzer.OperatorParameter.ActualName = "LayerAnalyzer";
 
       analyzer.OperatorParameter.ActualName = "Analyzer";

branches/ALPS/HeuristicLab.Algorithms.ALPS.SteadyState/3.3/HeuristicLab.Algorithms.ALPS.SteadyState-3.3.csproj

@@ -137 +137 @@
     <Compile Include="AlpsSsGeneticAlgorithmMainLoop.cs" />
     <Compile Include="AlpsSsGeneticAlgorithmMainOperator.cs" />
+    <Compile Include="AlpsSsMover.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Plugin.cs" />

branches/ALPS/HeuristicLab.Algorithms.ALPS.SteadyState/3.3/RandomLayerProcessor.cs

@@ -41 +41 @@
     }
 
-    private ILookupParameter<IntArray> PopulationSizeParameter {
-      get { return (ILookupParameter<IntArray>)Parameters["PopulationSize"]; }
-    }
-
     public IOperator Operator {
       get { return OperatorParameter.Value; }
@@ -59 +55 @@
       Parameters.Add(new OperatorParameter("Operator", "The operator which should be applied on a random sub-scopes of the current scope."));
       Parameters.Add(new LookupParameter<IRandom>("Random", "The random number generator to use."));
-
-      Parameters.Add(new LookupParameter<IntArray>("PopulationSize"));
     }
 
@@ -74 +68 @@
         var subScopes = ExecutionContext.Scope.SubScopes;
         int index = random.Next(subScopes.Count);
-        var selectedLayer = subScopes[index];
-
-        var layerParameters = new LayerIntermediateParameter {
-            new ValueParameter<IntValue>(PopulationSizeParameter.ActualName, new IntValue(PopulationSizeParameter.ActualValue[Math.Min(index, PopulationSizeParameter.ActualValue.Length - 1)]))
-          };
-        var immediateContext = new ExecutionContext(ExecutionContext.Parent, layerParameters, selectedLayer);
-        next.Insert(0, immediateContext.CreateChildOperation(Operator, selectedLayer));
+        next.Insert(0, ExecutionContext.CreateOperation(Operator, subScopes[index]));
       }
       return next;