Changeset 8359

Timestamp:

07/30/12 14:13:17 (12 years ago)

Author:

jkarder

Message:

#1247:

• adjusted event handling
• improved operator graph
• changed default parameter values

Location:

branches/RAPGA/HeuristicLab.Algorithms.RAPGA/3.3

Files:

• RAPGA.cs (modified) (4 diffs)
• RAPGAMainLoop.cs (modified) (12 diffs)

branches/RAPGA/HeuristicLab.Algorithms.RAPGA/3.3/RAPGA.cs

@@ -189 +189 @@
       Parameters.Add(new ValueParameter<IntValue>("Seed", "The random seed used to initialize the new pseudo random number generator.", new IntValue(0)));
       Parameters.Add(new ValueParameter<BoolValue>("SetSeedRandomly", "True if the random seed should be set to a random value, otherwise false.", new BoolValue(true)));
-      Parameters.Add(new ValueParameter<IntValue>("PopulationSize", "The size of the population of solutions.", new IntValue(300)));
+      Parameters.Add(new ValueParameter<IntValue>("PopulationSize", "The size of the population of solutions.", new IntValue(100)));
       Parameters.Add(new ValueParameter<IntValue>("MinimumPopulationSize", "The minimum size of the population of solutions.", new IntValue(2)));
-      Parameters.Add(new ValueParameter<IntValue>("MaximumPopulationSize", "The maximum size of the population of solutions.", new IntValue(499)));
+      Parameters.Add(new ValueParameter<IntValue>("MaximumPopulationSize", "The maximum size of the population of solutions.", new IntValue(299)));
       Parameters.Add(new ValueParameter<DoubleValue>("ComparisonFactor", "The comparison factor.", new DoubleValue(0.0)));
-      Parameters.Add(new ValueParameter<IntValue>("Effort", "The maximum number of offspring created in each generation.", new IntValue(1000)));
+      Parameters.Add(new ValueParameter<IntValue>("Effort", "The maximum number of offspring created in each generation.", new IntValue(400)));
       Parameters.Add(new ConstrainedValueParameter<ISelector>("Selector", "The operator used to select solutions for reproduction."));
       Parameters.Add(new ConstrainedValueParameter<ICrossover>("Crossover", "The operator used to cross solutions."));
@@ -302 +302 @@
       base.Problem_OperatorsChanged(sender, e);
     }
+    void EffortParameter_ValueChanged(object sender, EventArgs e) {
+      Effort.ValueChanged +=new EventHandler(Effort_ValueChanged);
+      ParameterizeSelectors();
+    }
+    void Effort_ValueChanged(object sender, EventArgs e) {
+      ParameterizeSelectors();
+    }
     private void ElitesParameter_ValueChanged(object sender, EventArgs e) {
       Elites.ValueChanged += new EventHandler(Elites_ValueChanged);
@@ -330 +337 @@
       ElitesParameter.ValueChanged += new EventHandler(ElitesParameter_ValueChanged);
       Elites.ValueChanged += new EventHandler(Elites_ValueChanged);
+      EffortParameter.ValueChanged += new EventHandler(EffortParameter_ValueChanged);
+      Effort.ValueChanged += new EventHandler(Effort_ValueChanged);
       if (Problem != null) {
         Problem.Evaluator.QualityParameter.ActualNameChanged += new EventHandler(Evaluator_QualityParameter_ActualNameChanged);
@@ -356 +365 @@
       foreach (ISelector selector in SelectorParameter.ValidValues) {
         selector.CopySelected = new BoolValue(true);
-        selector.NumberOfSelectedSubScopesParameter.Value = new IntValue(2 * (PopulationSizeParameter.Value.Value - ElitesParameter.Value.Value));
+        selector.NumberOfSelectedSubScopesParameter.Value = new IntValue(2 * EffortParameter.Value.Value);
         selector.NumberOfSelectedSubScopesParameter.Hidden = true;
         ParameterizeStochasticOperator(selector);

branches/RAPGA/HeuristicLab.Algorithms.RAPGA/3.3/RAPGAMainLoop.cs

@@ -136 +136 @@
       #region Create operators
       VariableCreator variableCreator = new VariableCreator();
-      Assigner assigner1 = new Assigner();
-      ResultsCollector resultsCollector1 = new ResultsCollector();
+      IntCounter intCounter1 = new IntCounter();
+      ResultsCollector resultsCollector = new ResultsCollector();
       Placeholder analyzer1 = new Placeholder();
       Placeholder selector = new Placeholder();
@@ -149 +149 @@
       Placeholder evaluator = new Placeholder();
       WeightedParentsQualityComparator comparator1 = new WeightedParentsQualityComparator();
+      SubScopesCounter subScopesCounter1 = new SubScopesCounter();
       ConditionalSelector conditionalSelector = new ConditionalSelector();
       RightReducer rightReducer1 = new RightReducer();
@@ -155 +156 @@
       DuplicateSelector duplicateSelector = new DuplicateSelector();
       LeftReducer leftReducer = new LeftReducer();
-      SubScopesCounter subScopesCounter1 = new SubScopesCounter();
-      IntCounter intCounter1 = new IntCounter();
+      SubScopesCounter subScopesCounter2 = new SubScopesCounter();
       Comparator comparator2 = new Comparator();
       ConditionalBranch conditionalBranch1 = new ConditionalBranch();
@@ -170 +170 @@
       Placeholder analyzer2 = new Placeholder();
       ConditionalBranch conditionalBranch2 = new ConditionalBranch();
-      Assigner assigner2 = new Assigner();
-      SubScopesCounter subScopesCounter2 = new SubScopesCounter();
-      ResultsCollector resultsCollector2 = new ResultsCollector();
+      SubScopesCounter subScopesCounter3 = new SubScopesCounter();
       Comparator comparator4 = new Comparator();
       ConditionalBranch conditionalBranch3 = new ConditionalBranch();
 
-      variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("Generations", new IntValue(0))); // Class GeneticAlgorithm expects this to be called Generations
+      variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("Generations", new IntValue(0))); // Class RAPGA expects this to be called Generations
       variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("CurrentPopulationSize", new IntValue(0)));
 
-      assigner1.Name = "Initialize CurrentPopulationSize";
-      assigner1.LeftSideParameter.ActualName = "CurrentPopulationSize";
-      assigner1.RightSideParameter.ActualName = EvaluatedSolutionsParameter.ActualName;
-
-      resultsCollector1.CollectedValues.Add(new LookupParameter<IntValue>("Generations"));
-      resultsCollector1.CollectedValues.Add(new LookupParameter<IntValue>("CurrentPopulationSize"));
-      resultsCollector1.ResultsParameter.ActualName = "Results";
+      intCounter1.Name = "Initialize CurrentPopulationSize";
+      intCounter1.IncrementParameter.ActualName = PopulationSizeParameter.Name;
+      intCounter1.IncrementParameter.Value = null;
+      intCounter1.ValueParameter.ActualName = "CurrentPopulationSize";
+
+      resultsCollector.CollectedValues.Add(new LookupParameter<IntValue>("Generations"));
+      resultsCollector.CollectedValues.Add(new LookupParameter<IntValue>("CurrentPopulationSize"));
+      resultsCollector.ResultsParameter.ActualName = "Results";
 
       analyzer1.Name = "Analyzer";
@@ -215 +214 @@
       comparator1.ResultParameter.ActualName = "SuccessfulOffspring";
 
+      subScopesCounter1.Name = "Increment EvaluatedSolutions";
+      subScopesCounter1.ValueParameter.ActualName = EvaluatedSolutionsParameter.Name;
+
       conditionalSelector.ConditionParameter.ActualName = "SuccessfulOffspring";
       conditionalSelector.ConditionParameter.Depth = 1;
@@ -225 +227 @@
       subScopesRemover.RemoveAllSubScopes = true;
 
-      subScopesCounter1.Name = "Count Successful Offspring";
-      subScopesCounter1.ValueParameter.ActualName = "NumberOfSuccessfulOffspring";
-
-      intCounter1.IncrementParameter.ActualName = "NumberOfSuccessfulOffspring";
-      intCounter1.IncrementParameter.Value = null;
-      intCounter1.ValueParameter.ActualName = EvaluatedSolutionsParameter.Name;
+      subScopesCounter2.Name = "Count Successful Offspring";
+      subScopesCounter2.ValueParameter.ActualName = "NumberOfSuccessfulOffspring";
 
       comparator2.Comparison = new Comparison(ComparisonType.GreaterOrEqual);
@@ -239 +237 @@
       conditionalBranch1.ConditionParameter.ActualName = "SelectMaximum";
 
-      bestSelector1.CopySelected = new BoolValue(true);
+      bestSelector1.CopySelected = new BoolValue(false);
       bestSelector1.MaximizationParameter.ActualName = MaximizationParameter.Name;
       bestSelector1.NumberOfSelectedSubScopesParameter.ActualName = MaximumPopulationSizeParameter.Name;
       bestSelector1.QualityParameter.ActualName = QualityParameter.Name;
 
-      bestSelector2.CopySelected = new BoolValue(true);
+      bestSelector2.CopySelected = new BoolValue(false);
       bestSelector2.MaximizationParameter.ActualName = MaximizationParameter.Name;
       bestSelector2.NumberOfSelectedSubScopesParameter.ActualName = "NumberOfSuccessfulOffspring";
@@ -267 +265 @@
       conditionalBranch2.ConditionParameter.ActualName = "Terminate";
 
-      assigner2.Name = "Reset CurrentPopulationSize";
-      assigner2.LeftSideParameter.ActualName = "CurrentPopulationSize";
-      assigner2.RightSideParameter.Value = new IntValue(0);
-
-      subScopesCounter2.Name = "Set CurrentPopulationSize";
-      subScopesCounter2.ValueParameter.ActualName = "CurrentPopulationSize";
-
-      resultsCollector2.CollectedValues.Add(new LookupParameter<IntValue>("CurrentPopulationSize"));
-      resultsCollector2.ResultsParameter.ActualName = "Results";
+      subScopesCounter3.Name = "Set CurrentPopulationSize";
+      subScopesCounter3.ValueParameter.ActualName = "CurrentPopulationSize";
+      subScopesCounter3.AccumulateParameter.Value = new BoolValue(false);
 
       comparator4.Comparison = new Comparison(ComparisonType.Less);
@@ -287 +279 @@
       #region Create operator graph
       OperatorGraph.InitialOperator = variableCreator;
-      variableCreator.Successor = assigner1;
-      assigner1.Successor = resultsCollector1;
-      resultsCollector1.Successor = analyzer1;
+      variableCreator.Successor = intCounter1;
+      intCounter1.Successor = resultsCollector;
+      resultsCollector.Successor = analyzer1;
       analyzer1.Successor = selector;
       selector.Successor = subScopesProcessor1;
@@ -305 +297 @@
       subScopesRemover.Successor = null;
       uniformSubScopesProcessor2.Operator = evaluator;
-      uniformSubScopesProcessor2.Successor = conditionalSelector;
+      uniformSubScopesProcessor2.Successor = subScopesCounter1;
       evaluator.Successor = comparator1;
+      subScopesCounter1.Successor = conditionalSelector;
       conditionalSelector.Successor = rightReducer1;
       rightReducer1.Successor = uniformSubScopesProcessor3;
@@ -312 +305 @@
       uniformSubScopesProcessor3.Successor = duplicateSelector;
       duplicateSelector.Successor = leftReducer;
-      leftReducer.Successor = subScopesCounter1;
-      subScopesCounter1.Successor = intCounter1;
-      intCounter1.Successor = comparator2;
+      leftReducer.Successor = subScopesCounter2;
+      subScopesCounter2.Successor = comparator2;
       comparator2.Successor = conditionalBranch1;
       conditionalBranch1.TrueBranch = bestSelector1;
@@ -329 +321 @@
       comparator3.Successor = analyzer2;
       analyzer2.Successor = conditionalBranch2;
-      conditionalBranch2.FalseBranch = assigner2;
+      conditionalBranch2.FalseBranch = subScopesCounter3;
       conditionalBranch2.TrueBranch = null;
       conditionalBranch2.Successor = null;
-      assigner2.Successor = subScopesCounter2;
-      subScopesCounter2.Successor = resultsCollector2;
-      resultsCollector2.Successor = comparator4;
+      subScopesCounter3.Successor = comparator4;
       comparator4.Successor = conditionalBranch3;
       conditionalBranch3.FalseBranch = selector;