Changeset 3611 for trunk/sources/HeuristicLab.Algorithms.GeneticAlgorithm/3.3

Timestamp:

05/04/10 20:09:14 (14 years ago)

Author:

abeham

Message:

Changed Island OSGA #976

• removed mainloop
• added mainoperator

File:

• trunk/sources/HeuristicLab.Algorithms.GeneticAlgorithm/3.3/IslandGeneticAlgorithmMainLoop.cs (modified) (10 diffs)

trunk/sources/HeuristicLab.Algorithms.GeneticAlgorithm/3.3/IslandGeneticAlgorithmMainLoop.cs

@@ -171 +171 @@
       QualityDifferenceCalculator islandQualityDifferenceCalculator2 = new QualityDifferenceCalculator();
       Placeholder islandVisualizer2 = new Placeholder();
-      // END GA mainloop
+      IntCounter generationsCounter = new IntCounter();
       IntCounter generationsSinceLastMigrationCounter = new IntCounter();
       Comparator migrationComparator = new Comparator();
@@ -182 +182 @@
       UniformSubScopesProcessor uniformSubScopesProcessor4 = new UniformSubScopesProcessor();
       Placeholder immigrationReplacer = new Placeholder();
-      IntCounter generationsCounter = new IntCounter();
       Comparator generationsComparator = new Comparator();
       BestQualityMemorizer bestQualityMemorizer3 = new BestQualityMemorizer();
@@ -272 +271 @@
       resultsCollector.ResultsParameter.ActualName = ResultsParameter.Name;
 
-      // START GA mainloop
       selector.Name = "Selector (placeholder)";
       selector.OperatorParameter.ActualName = SelectorParameter.Name;
@@ -321 +319 @@
       islandVisualizer2.Name = "Visualizer";
       islandVisualizer2.OperatorParameter.ActualName = "Visualizer";
-      // END GA mainloop
-
+
+      generationsCounter.Name = "Generations + 1";
+      generationsCounter.Increment = new IntValue(1);
+      generationsCounter.ValueParameter.ActualName = "Generations";
+
+      generationsSinceLastMigrationCounter.Name = "GenerationsSinceLastMigration + 1";
       generationsSinceLastMigrationCounter.ValueParameter.ActualName = "GenerationsSinceLastMigration";
       generationsSinceLastMigrationCounter.Increment = new IntValue(1);
 
+      migrationComparator.Name = "GenerationsSinceLastMigration = MigrationInterval ?";
       migrationComparator.LeftSideParameter.ActualName = "GenerationsSinceLastMigration";
       migrationComparator.Comparison = new Comparison(ComparisonType.Equal);
@@ -331 +334 @@
       migrationComparator.ResultParameter.ActualName = "Migrate";
 
+      migrationBranch.Name = "Migrate?";
       migrationBranch.ConditionParameter.ActualName = "Migrate";
 
-      resetGenerationsSinceLastMigrationAssigner.Name = "Reset Counter";
+      resetGenerationsSinceLastMigrationAssigner.Name = "Reset GenerationsSinceLastMigration";
       resetGenerationsSinceLastMigrationAssigner.LeftSideParameter.ActualName = "GenerationsSinceLastMigration";
       resetGenerationsSinceLastMigrationAssigner.RightSideParameter.Value = new IntValue(0);
@@ -350 +354 @@
       immigrationReplacer.OperatorParameter.ActualName = ImmigrationReplacerParameter.Name;
 
-      generationsCounter.Name = "Generations + 1";
-      generationsCounter.Increment = new IntValue(1);
-      generationsCounter.ValueParameter.ActualName = "Generations";
-
+      generationsComparator.Name = "Generations >= MaximumGenerations ?";
       generationsComparator.Comparison = new Comparison(ComparisonType.GreaterOrEqual);
       generationsComparator.LeftSideParameter.ActualName = "Generations";
@@ -385 +386 @@
       qualityDifferenceCalculator2.SecondQualityParameter.ActualName = "BestQuality";
 
+      generationsTerminationCondition.Name = "Terminate?";
       generationsTerminationCondition.ConditionParameter.ActualName = "TerminateGenerations";
       #endregion
@@ -406 +408 @@
       resultsCollector.Successor = uniformSubScopesProcessor1;
       uniformSubScopesProcessor1.Operator = selector;
-      uniformSubScopesProcessor1.Successor = generationsSinceLastMigrationCounter;
+      uniformSubScopesProcessor1.Successor = generationsCounter;
       selector.Successor = subScopesProcessor1;
       subScopesProcessor1.Operators.Add(new EmptyOperator());
@@ -432 +434 @@
       islandQualityDifferenceCalculator2.Successor = islandVisualizer2;
       islandVisualizer2.Successor = null;
+      generationsCounter.Successor = generationsSinceLastMigrationCounter;
       generationsSinceLastMigrationCounter.Successor = migrationComparator;
       migrationComparator.Successor = migrationBranch;
       migrationBranch.TrueBranch = resetGenerationsSinceLastMigrationAssigner;
       migrationBranch.FalseBranch = null;
-      migrationBranch.Successor = generationsCounter;
+      migrationBranch.Successor = generationsComparator;
       resetGenerationsSinceLastMigrationAssigner.Successor = migrationsCounter;
       migrationsCounter.Successor = uniformSubScopesProcessor3;
@@ -444 +447 @@
       uniformSubScopesProcessor4.Operator = immigrationReplacer;
       uniformSubScopesProcessor4.Successor = null;
-      generationsCounter.Successor = generationsComparator;
       generationsComparator.Successor = bestQualityMemorizer3;
       bestQualityMemorizer3.Successor = bestQualityMemorizer4;