Changeset 12142 for branches/ALPS/HeuristicLab.Algorithms.ALPS.SteadyState/3.3/RandomLayerProcessor.cs

Timestamp:

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

Author:

pfleck

Message:

#2350

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

File:

• branches/ALPS/HeuristicLab.Algorithms.ALPS.SteadyState/3.3/RandomLayerProcessor.cs (modified) (3 diffs)

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;