Changeset 13604 for branches/IslandALPS/IslandALPS/3.3/IslandALPSAlgorthmsMainLoop.cs

Timestamp:

02/08/16 15:55:31 (8 years ago)

Author:

pkuelzer

Message:

#2558 Include LayerNumber in GroupResults
Added Migration

File:

• branches/IslandALPS/IslandALPS/3.3/IslandALPSAlgorthmsMainLoop.cs (modified) (6 diffs)

branches/IslandALPS/IslandALPS/3.3/IslandALPSAlgorthmsMainLoop.cs

@@ -225 +225 @@
       var resultsCollector = new ResultsCollector();
 
-      var processIslandsUssp = new UniformSubScopesProcessor() {Name = "Process Islands"};
+      var processIslandsUssp = new UniformSubScopesProcessor() {Name = "Process Islands", Parallel = new BoolValue(true)};
       var initIslandGenerationsAss = new Assigner() {Name = "Init Island Generations"};
       var initIslandEvaluationsAss = new Assigner() {Name = "Init Island Evaluations"};
@@ -231 +231 @@
       var incrementGenerationDr = new DataReducer() { Name = "Increment Generations" };
       var incrementEvaluatedSolutionDr = new DataReducer() { Name = "Increment Evaluated Solutions" };
-      //TODO: increase migration count + migrate
 
       var elderMigrator = CreateEldersEmigrator();
@@ -250 +249 @@
       var groupResultsExtractor = new ResultsExtractor() {Name = "Collect group results into variable"};
       var groupResultsCollector = new ResultsCollector() {Name = "Collect group results into into global results"};
-
+      var groupLayerNumberResultsCollector = new ResultsCollector() {Name = "Add Layernumber to Results"};
 
       var matingPoolCreator = new MatingPoolCreator();
       var matingPoolUssp = new UniformSubScopesProcessor() {Name = "Process Mating Pools"};
-      var alpsMainOperator =new AlpsGeneticAlgorithmMainOperator();
+      var alpsMainOperator = new AlpsGeneticAlgorithmMainOperator();
 
       var incrementIslandGeneration = new IntCounter() {Name = "incrementIslandGeneration" };
       var setIslandEvaluatedSolutions = new DataReducer() {Name = "Set IslandEvaluatedSolutions" };
+       
+      var migrationCounter = new IntCounter() {Name = "Increment  Migrations"};
+      var selectforMigrationUssp = new UniformSubScopesProcessor();
+      var emigrantSelector = new Placeholder() {Name = "Emigrant Selector (Placeholder)"};
+      var migrator = new LayerMigrator();
+      var replaceforMigrationUssp = new UniformSubScopesProcessor();
+      var immigrantSelector = new Placeholder() { Name = "Immigrant Replacer (Placeholder)" };
 
       var migrateComparator = new Comparator();
@@ -283 +289 @@
       resultsCollector.CollectedValues.Add(new ScopeTreeLookupParameter<ResultCollection>("IslandResults","","IslandResults"));
       resultsCollector.CollectedValues.Add(new ScopeTreeLookupParameter<ResultCollection>("GroupResults","","GroupResults"));
+      resultsCollector.CollectedValues.Add(new ValueLookupParameter<IntValue>("Migrations"));
       resultsCollector.CopyValue = new BoolValue(false);
 
@@ -314 +321 @@
       migrateCondBranch.ConditionParameter.ActualName = "Migrate";
 
+      migrationCounter.ValueParameter.ActualName = "Migrations";
+      selectforMigrationUssp.Depth = new IntValue(2);
+      emigrantSelector.OperatorParameter.ActualName = EmigrantsSelectorParameter.Name;
+
+      replaceforMigrationUssp.Depth = new IntValue(2);
+      immigrantSelector.OperatorParameter.ActualName = ImmigrationReplacerParameter.Name;
+
       groupAnalyzer.OperatorParameter.ActualName = GroupAnalyzerParameter.Name;
+      groupLayerNumberResultsCollector.CollectedValues.Add(new LookupParameter<IntValue>("LayerNumber"));
+      groupLayerNumberResultsCollector.ResultsParameter.ActualName = "GroupResults";
+
       layerAnalyzerPlaceholder.OperatorParameter.ActualName = LayerAnalyzerParameter.Name;
       layerResultsCollector.ResultsParameter.ActualName = "LayerResults";
@@ -384 +401 @@
       processIslandsUssp.Successor = incrementGenerationDr;
       incrementGenerationDr.Successor = incrementEvaluatedSolutionDr;
-      incrementEvaluatedSolutionDr.Successor = globalAnalyzerPlacerholder;
+      incrementEvaluatedSolutionDr.Successor = migrationCounter;
+      
+      migrationCounter.Successor = selectforMigrationUssp;
+      selectforMigrationUssp.Operator = emigrantSelector;
+      emigrantSelector.Successor = null;
+      selectforMigrationUssp.Successor = migrator;
+
+      migrator.Successor = replaceforMigrationUssp;
+      replaceforMigrationUssp.Operator = immigrantSelector;
+      immigrantSelector.Successor = null;
+      replaceforMigrationUssp.Successor = globalAnalyzerPlacerholder;
+
       globalAnalyzerPlacerholder.Successor = groupingOperator;
       groupingOperator.Operator = groupAnalyzer;
-      groupAnalyzer.Successor = null;
+      groupAnalyzer.Successor = groupLayerNumberResultsCollector;
+      groupLayerNumberResultsCollector.Successor = null;
       groupingOperator.Successor = groupResultsExtractor;
       groupResultsExtractor.Successor = groupResultsCollector;