Changeset 12157 for branches/ALPS/HeuristicLab.Algorithms.ALPS.SteadyState/3.3

Timestamp:

03/09/15 09:39:47 (10 years ago)

Author:

pfleck

Message:

#2350

• Added a NamedSubScopeProcessor to process an name Scope (created by the NamedSubScopesCreator).
• Changed the Steady-State ALPS to use the new Processor.

Location:

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

Files:

• AlpsSsGeneticAlgorithm.cs (modified) (2 diffs)
• HeuristicLab.Algorithms.ALPS.SteadyState-3.3.csproj (modified) (1 diff)
• NamedSubScopeProcessor.cs (added)
• NamedSubScopesCreator.cs (modified) (1 diff)

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

@@ -131 +131 @@
       var randomCreator = new RandomCreator();
       var workingScopeCreator = new NamedSubScopesCreator() { Name = "Create WorkingScope and Layers-Scope" };
-      var layersProcessor = new SubScopesProcessor();
+      var layersProcessor = new NamedSubScopeProcessor() { Name = "Process Layers-Scope" };
       var layerCreator = new SubScopesCreator() { Name = "Create Layer" };
       var layerProcessor = new /*Layer*/UniformSubScopesProcessor();
@@ -152 +152 @@
       workingScopeCreator.Successor = layersProcessor;
 
-      layersProcessor.Operators.Add(new EmptyOperator());
-      layersProcessor.Operators.Add(layerCreator);
+      layersProcessor.TargetScopeParameter.ActualName = "Layers";
+      layersProcessor.Operator = layerCreator;
 
       layerCreator.NumberOfSubScopesParameter.ActualName = "NumberOfLayers";

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

@@ -138 +138 @@
     <Compile Include="AlpsSsGeneticAlgorithmMainOperator.cs" />
     <Compile Include="AlpsSsMover.cs" />
+    <Compile Include="NamedSubScopeProcessor.cs" />
     <Compile Include="NamedSubScopesCreator.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

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

@@ -51 +51 @@
 
     public override IOperation Apply() {
+      var intermediateParameters = new LayerIntermediateParameter();
       foreach (string name in NamesParameter.Value) {
-        ExecutionContext.Scope.SubScopes.Add(new Scope(name));
+        var scope = new Scope(name);
+        ExecutionContext.Scope.SubScopes.Add(scope);
+        intermediateParameters.Add(new ValueParameter<IScope>(name, scope));
       }
-      return base.Apply();
+
+      var intermediateContext = new ExecutionContext(ExecutionContext.Parent, intermediateParameters, ExecutionContext.Scope);
+      return Successor != null ? intermediateContext.CreateChildOperation(Successor) : null;
     }
   }