Changeset 3891 for trunk/sources/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm

Timestamp:

06/02/10 17:20:06 (14 years ago)

Author:

abeham

Message:

#1030

• Added maximum evaluated solutions termination criterion to OSGAs

Location:

trunk/sources/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3

Files:

• IslandOffspringSelectionGeneticAlgorithm.cs (modified) (3 diffs)
• IslandOffspringSelectionGeneticAlgorithmMainLoop.cs (modified) (6 diffs)
• OffspringSelectionGeneticAlgorithm.cs (modified) (3 diffs)
• OffspringSelectionGeneticAlgorithmMainLoop.cs (modified) (6 diffs)
• SASEGASA.cs (modified) (3 diffs)
• SASEGASAMainLoop.cs (modified) (5 diffs)

trunk/sources/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/IslandOffspringSelectionGeneticAlgorithm.cs

@@ -127 +127 @@
       get { return (ValueParameter<MultiAnalyzer>)Parameters["IslandAnalyzer"]; }
     }
+    private ValueParameter<IntValue> MaximumEvaluatedSolutionsParameter {
+      get { return (ValueParameter<IntValue>)Parameters["MaximumEvaluatedSolutions"]; }
+    }
     #endregion
 
@@ -221 +224 @@
       get { return IslandAnalyzerParameter.Value; }
       set { IslandAnalyzerParameter.Value = value; }
+    }
+    public IntValue MaximumEvaluatedSolutions {
+      get { return MaximumEvaluatedSolutionsParameter.Value; }
+      set { MaximumEvaluatedSolutionsParameter.Value = value; }
     }
     private RandomCreator RandomCreator {
@@ -272 +279 @@
       Parameters.Add(new ValueParameter<MultiAnalyzer>("Analyzer", "The operator used to analyze the islands.", new MultiAnalyzer()));
       Parameters.Add(new ValueParameter<MultiAnalyzer>("IslandAnalyzer", "The operator used to analyze each island.", new MultiAnalyzer()));
-      
+      Parameters.Add(new ValueParameter<IntValue>("MaximumEvaluatedSolutions", "The maximum number of evaluated solutions (approximately).", new IntValue(int.MaxValue)));
+
       RandomCreator randomCreator = new RandomCreator();
       SubScopesCreator populationCreator = new SubScopesCreator();

trunk/sources/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/IslandOffspringSelectionGeneticAlgorithmMainLoop.cs

@@ -203 +203 @@
       Comparator generationsComparator = new Comparator();
       Comparator terminatedIslandsComparator = new Comparator();
+      Comparator maxEvaluatedSolutionsComparator = new Comparator();
       Placeholder comparisonFactorModifier = new Placeholder();
       Placeholder analyzer2 = new Placeholder();
@@ -208 +209 @@
       ConditionalBranch generationsTerminationCondition = new ConditionalBranch();
       ConditionalBranch terminatedIslandsCondition = new ConditionalBranch();
+      ConditionalBranch evaluatedSolutionsTerminationCondition = new ConditionalBranch();
 
       variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("Migrations", new IntValue(0)));
@@ -348 +350 @@
       terminatedIslandsComparator.ResultParameter.ActualName = "TerminateTerminatedIslands";
 
+      maxEvaluatedSolutionsComparator.Name = "EvaluatedSolutions >= MaximumEvaluatedSolutions ?";
+      maxEvaluatedSolutionsComparator.Comparison = new Comparison(ComparisonType.GreaterOrEqual);
+      maxEvaluatedSolutionsComparator.LeftSideParameter.ActualName = "EvaluatedSolutions";
+      maxEvaluatedSolutionsComparator.ResultParameter.ActualName = "TerminateEvaluatedSolutions";
+      maxEvaluatedSolutionsComparator.RightSideParameter.ActualName = "MaximumEvaluatedSolutions";
+
       comparisonFactorModifier.Name = "Update Comparison Factor (Placeholder)";
       comparisonFactorModifier.OperatorParameter.ActualName = ComparisonFactorModifierParameter.Name;
@@ -363 +371 @@
       terminatedIslandsCondition.Name = "Terminate (TerminatedIslands) ?";
       terminatedIslandsCondition.ConditionParameter.ActualName = "TerminateTerminatedIslands";
+
+      evaluatedSolutionsTerminationCondition.Name = "Terminate (EvaluatedSolutions) ?";
+      evaluatedSolutionsTerminationCondition.ConditionParameter.ActualName = "TerminateEvaluatedSolutions";
       #endregion
 
@@ -409 +420 @@
       immigrationReplacer.Successor = null;
       generationsComparator.Successor = terminatedIslandsComparator;
-      terminatedIslandsComparator.Successor = comparisonFactorModifier;
+      terminatedIslandsComparator.Successor = maxEvaluatedSolutionsComparator;
+      maxEvaluatedSolutionsComparator.Successor = comparisonFactorModifier;
       comparisonFactorModifier.Successor = analyzer2;
       analyzer2.Successor = resultsCollector3;
@@ -417 +429 @@
       generationsTerminationCondition.Successor = null;
       terminatedIslandsCondition.TrueBranch = null;
-      terminatedIslandsCondition.FalseBranch = uniformSubScopesProcessor1;
+      terminatedIslandsCondition.FalseBranch = evaluatedSolutionsTerminationCondition;
       terminatedIslandsCondition.Successor = null;
+      evaluatedSolutionsTerminationCondition.TrueBranch = null;
+      evaluatedSolutionsTerminationCondition.FalseBranch = uniformSubScopesProcessor1;
+      evaluatedSolutionsTerminationCondition.Successor = null;
       #endregion
     }

trunk/sources/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/OffspringSelectionGeneticAlgorithm.cs

@@ -104 +104 @@
       get { return (ValueParameter<MultiAnalyzer>)Parameters["Analyzer"]; }
     }
+    private ValueParameter<IntValue> MaximumEvaluatedSolutionsParameter {
+      get { return (ValueParameter<IntValue>)Parameters["MaximumEvaluatedSolutions"]; }
+    }
     #endregion
 
@@ -174 +177 @@
       get { return AnalyzerParameter.Value; }
       set { AnalyzerParameter.Value = value; }
+    }
+    public IntValue MaximumEvaluatedSolutions {
+      get { return MaximumEvaluatedSolutionsParameter.Value; }
+      set { MaximumEvaluatedSolutionsParameter.Value = value; }
     }
     private RandomCreator RandomCreator {
@@ -211 +218 @@
       Parameters.Add(new ValueLookupParameter<IntValue>("SelectedParents", "How much parents should be selected each time the offspring selection step is performed until the population is filled. This parameter should be about the same or twice the size of PopulationSize for smaller problems, and less for large problems.", new IntValue(200)));
       Parameters.Add(new ValueParameter<MultiAnalyzer>("Analyzer", "The operator used to analyze each generation.", new MultiAnalyzer()));
-      
+      Parameters.Add(new ValueParameter<IntValue>("MaximumEvaluatedSolutions", "The maximum number of evaluated solutions (approximately).", new IntValue(int.MaxValue)));
+
       RandomCreator randomCreator = new RandomCreator();
       SolutionsCreator solutionsCreator = new SolutionsCreator();

trunk/sources/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/OffspringSelectionGeneticAlgorithmMainLoop.cs

@@ -133 +133 @@
       Comparator maxGenerationsComparator = new Comparator();
       Comparator maxSelectionPressureComparator = new Comparator();
+      Comparator maxEvaluatedSolutionsComparator = new Comparator();
       Placeholder comparisonFactorModifier = new Placeholder();
       Placeholder analyzer2 = new Placeholder();
@@ -138 +139 @@
       ConditionalBranch conditionalBranch1 = new ConditionalBranch();
       ConditionalBranch conditionalBranch2 = new ConditionalBranch();
+      ConditionalBranch conditionalBranch3 = new ConditionalBranch();
 
       variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("Generations", new IntValue(0))); // Class OffspringSelectionGeneticAlgorithm expects this to be called Generations
@@ -192 +194 @@
       maxSelectionPressureComparator.RightSideParameter.ActualName = MaximumSelectionPressureParameter.Name;
 
+      maxEvaluatedSolutionsComparator.Comparison = new Comparison(ComparisonType.GreaterOrEqual);
+      maxEvaluatedSolutionsComparator.LeftSideParameter.ActualName = "EvaluatedSolutions";
+      maxEvaluatedSolutionsComparator.ResultParameter.ActualName = "TerminateEvaluatedSolutions";
+      maxEvaluatedSolutionsComparator.RightSideParameter.ActualName = "MaximumEvaluatedSolutions";
+
       comparisonFactorModifier.Name = "Update ComparisonFactor (placeholder)";
       comparisonFactorModifier.OperatorParameter.ActualName = ComparisonFactorModifierParameter.Name;
@@ -207 +214 @@
       conditionalBranch2.Name = "MaximumGenerations reached?";
       conditionalBranch2.ConditionParameter.ActualName = "TerminateMaximumGenerations";
+
+      conditionalBranch3.Name = "MaximumEvaluatedSolutions reached?";
+      conditionalBranch3.ConditionParameter.ActualName = "TerminateEvaluatedSolutions";
       #endregion
 
@@ -219 +229 @@
       generationsCounter.Successor = maxGenerationsComparator;
       maxGenerationsComparator.Successor = maxSelectionPressureComparator;
-      maxSelectionPressureComparator.Successor = comparisonFactorModifier;
+      maxSelectionPressureComparator.Successor = maxEvaluatedSolutionsComparator;
+      maxEvaluatedSolutionsComparator.Successor = comparisonFactorModifier;
       comparisonFactorModifier.Successor = analyzer2;
       analyzer2.Successor = resultsCollector3;
@@ -226 +237 @@
       conditionalBranch1.TrueBranch = null;
       conditionalBranch1.Successor = null;
-      conditionalBranch2.FalseBranch = mainOperator;
+      conditionalBranch2.FalseBranch = conditionalBranch3;
       conditionalBranch2.TrueBranch = null;
       conditionalBranch2.Successor = null;
+      conditionalBranch3.FalseBranch = mainOperator;
+      conditionalBranch3.TrueBranch = null;
+      conditionalBranch3.Successor = null;
       #endregion
     }

trunk/sources/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/SASEGASA.cs

@@ -116 +116 @@
       get { return (ValueParameter<MultiAnalyzer>)Parameters["VillageAnalyzer"]; }
     }
+    private ValueParameter<IntValue> MaximumEvaluatedSolutionsParameter {
+      get { return (ValueParameter<IntValue>)Parameters["MaximumEvaluatedSolutions"]; }
+    }
     #endregion
 
@@ -198 +201 @@
       get { return VillageAnalyzerParameter.Value; }
       set { VillageAnalyzerParameter.Value = value; }
+    }
+    public IntValue MaximumEvaluatedSolutions {
+      get { return MaximumEvaluatedSolutionsParameter.Value; }
+      set { MaximumEvaluatedSolutionsParameter.Value = value; }
     }
     private RandomCreator RandomCreator {
@@ -245 +252 @@
       Parameters.Add(new ValueParameter<MultiAnalyzer>("Analyzer", "The operator used to analyze the villages.", new MultiAnalyzer()));
       Parameters.Add(new ValueParameter<MultiAnalyzer>("VillageAnalyzer", "The operator used to analyze each village.", new MultiAnalyzer()));
-      
+      Parameters.Add(new ValueParameter<IntValue>("MaximumEvaluatedSolutions", "The maximum number of evaluated solutions (approximately).", new IntValue(int.MaxValue)));
+
       RandomCreator randomCreator = new RandomCreator();
       SubScopesCreator populationCreator = new SubScopesCreator();

trunk/sources/HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm/3.3/SASEGASAMainLoop.cs

@@ -185 +185 @@
       Assigner finalMaxSelPressAssigner = new Assigner();
       Comparator maximumGenerationsComparator = new Comparator();
+      Comparator maximumEvaluatedSolutionsComparator = new Comparator();
       Placeholder analyzer2 = new Placeholder();
       ResultsCollector resultsCollector3 = new ResultsCollector();
       ConditionalBranch terminationCondition = new ConditionalBranch();
       ConditionalBranch maximumGenerationsTerminationCondition = new ConditionalBranch();
+      ConditionalBranch maximumEvaluatedSolutionsTerminationCondition = new ConditionalBranch();
 
       variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("Reunifications", new IntValue(0)));
@@ -356 +358 @@
       maximumGenerationsComparator.ResultParameter.ActualName = "TerminateMaximumGenerations";
 
+      maximumEvaluatedSolutionsComparator.Name = "EvaluatedSolutions >= MaximumEvaluatedSolutions";
+      maximumEvaluatedSolutionsComparator.Comparison = new Comparison(ComparisonType.GreaterOrEqual);
+      maximumEvaluatedSolutionsComparator.LeftSideParameter.ActualName = "EvaluatedSolutions";
+      maximumEvaluatedSolutionsComparator.ResultParameter.ActualName = "TerminateEvaluatedSolutions";
+      maximumEvaluatedSolutionsComparator.RightSideParameter.ActualName = "MaximumEvaluatedSolutions";
+
       analyzer2.Name = "Analyzer (placeholder)";
       analyzer2.OperatorParameter.ActualName = AnalyzerParameter.Name;
@@ -365 +373 @@
       terminationCondition.ConditionParameter.ActualName = "TerminateSASEGASA";
       maximumGenerationsTerminationCondition.ConditionParameter.ActualName = "TerminateMaximumGenerations";
+      maximumEvaluatedSolutionsTerminationCondition.ConditionParameter.ActualName = "TerminateEvaluatedSolutions";
       #endregion
 
@@ -422 +431 @@
       villageCountConditionalBranch.Successor = null;
       finalMaxSelPressAssigner.Successor = null;
-      maximumGenerationsComparator.Successor = analyzer2;
+      maximumGenerationsComparator.Successor = maximumEvaluatedSolutionsComparator;
+      maximumEvaluatedSolutionsComparator.Successor = analyzer2;
       analyzer2.Successor = resultsCollector3;
       resultsCollector3.Successor = terminationCondition;
@@ -429 +439 @@
       terminationCondition.Successor = null;
       maximumGenerationsTerminationCondition.TrueBranch = null;
-      maximumGenerationsTerminationCondition.FalseBranch = uniformSubScopesProcessor1;
+      maximumGenerationsTerminationCondition.FalseBranch = maximumEvaluatedSolutionsTerminationCondition;
       maximumGenerationsTerminationCondition.Successor = null;
+      maximumEvaluatedSolutionsTerminationCondition.TrueBranch = null;
+      maximumEvaluatedSolutionsTerminationCondition.FalseBranch = uniformSubScopesProcessor1;
+      maximumEvaluatedSolutionsTerminationCondition.Successor = null;
       #endregion
     }