Changeset 3020 for trunk/sources/HeuristicLab.Algorithms.SGA

Timestamp:

03/14/10 18:55:01 (14 years ago)

Author:

swagner

Message:

Implemented reviewers' comments (#893)

• renamed SGAOperator to SGAMainLoop

Location:

trunk/sources/HeuristicLab.Algorithms.SGA/3.3

Files:

• HeuristicLab.Algorithms.SGA-3.3.csproj (modified) (1 diff)
• SGA.cs (modified) (7 diffs)
• SGAMainLoop.cs (moved) (moved from trunk/sources/HeuristicLab.Algorithms.SGA/3.3/SGAOperator.cs) (2 diffs)

trunk/sources/HeuristicLab.Algorithms.SGA/3.3/HeuristicLab.Algorithms.SGA-3.3.csproj

@@ -86 +86 @@
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="SGAOperator.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="SGAMainLoop.cs" />
   </ItemGroup>
   <ItemGroup>

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

@@ -123 +123 @@
       get { return (PopulationCreator)RandomCreator.Successor; }
     }
-    private SGAOperator SGAOperator {
-      get { return (SGAOperator)PopulationCreator.Successor; }
+    private SGAMainLoop SGAMainLoop {
+      get { return (SGAMainLoop)PopulationCreator.Successor; }
     }
     private List<ISelector> selectors;
@@ -146 +146 @@
       RandomCreator randomCreator = new RandomCreator();
       PopulationCreator populationCreator = new PopulationCreator();
-      SGAOperator sgaOperator = new SGAOperator();
+      SGAMainLoop sgaMainLoop = new SGAMainLoop();
       OperatorGraph.InitialOperator = randomCreator;
 
@@ -157 +157 @@
 
       populationCreator.PopulationSizeParameter.ActualName = PopulationSizeParameter.Name;
-      populationCreator.Successor = sgaOperator;
-
-      sgaOperator.SelectorParameter.ActualName = SelectorParameter.Name;
-      sgaOperator.CrossoverParameter.ActualName = CrossoverParameter.Name;
-      sgaOperator.ElitesParameter.ActualName = ElitesParameter.Name;
-      sgaOperator.MaximumGenerationsParameter.ActualName = MaximumGenerationsParameter.Name;
-      sgaOperator.MutatorParameter.ActualName = MutatorParameter.Name;
-      sgaOperator.MutationProbabilityParameter.ActualName = MutationProbabilityParameter.Name;
-      sgaOperator.RandomParameter.ActualName = RandomCreator.RandomParameter.ActualName;
-      sgaOperator.ResultsParameter.ActualName = "Results";
+      populationCreator.Successor = sgaMainLoop;
+
+      sgaMainLoop.SelectorParameter.ActualName = SelectorParameter.Name;
+      sgaMainLoop.CrossoverParameter.ActualName = CrossoverParameter.Name;
+      sgaMainLoop.ElitesParameter.ActualName = ElitesParameter.Name;
+      sgaMainLoop.MaximumGenerationsParameter.ActualName = MaximumGenerationsParameter.Name;
+      sgaMainLoop.MutatorParameter.ActualName = MutatorParameter.Name;
+      sgaMainLoop.MutationProbabilityParameter.ActualName = MutationProbabilityParameter.Name;
+      sgaMainLoop.RandomParameter.ActualName = RandomCreator.RandomParameter.ActualName;
+      sgaMainLoop.ResultsParameter.ActualName = "Results";
 
       Initialze();
@@ -185 +185 @@
       foreach (IOperator op in Problem.Operators) ParameterizeStochasticOperator(op);
       ParameterizePopulationCreator();
-      ParameterizeSGAOperator();
+      ParameterizeSGAMainLoop();
       ParameterizeSelectors();
       UpdateCrossovers();
@@ -200 +200 @@
       ParameterizeStochasticOperator(Problem.Evaluator);
       ParameterizePopulationCreator();
-      ParameterizeSGAOperator();
+      ParameterizeSGAMainLoop();
       ParameterizeSelectors();
       Problem.Evaluator.QualityParameter.ActualNameChanged += new EventHandler(Evaluator_QualityParameter_ActualNameChanged);
@@ -226 +226 @@
     }
     private void Evaluator_QualityParameter_ActualNameChanged(object sender, EventArgs e) {
-      ParameterizeSGAOperator();
+      ParameterizeSGAMainLoop();
       ParameterizeSelectors();
     }
@@ -248 +248 @@
       PopulationCreator.SolutionCreatorParameter.ActualName = Problem.SolutionCreatorParameter.Name;
     }
-    private void ParameterizeSGAOperator() {
-      SGAOperator.EvaluatorParameter.ActualName = Problem.EvaluatorParameter.Name;
-      SGAOperator.MaximizationParameter.ActualName = Problem.MaximizationParameter.Name;
-      SGAOperator.QualityParameter.ActualName = Problem.Evaluator.QualityParameter.ActualName;
+    private void ParameterizeSGAMainLoop() {
+      SGAMainLoop.EvaluatorParameter.ActualName = Problem.EvaluatorParameter.Name;
+      SGAMainLoop.MaximizationParameter.ActualName = Problem.MaximizationParameter.Name;
+      SGAMainLoop.QualityParameter.ActualName = Problem.Evaluator.QualityParameter.ActualName;
     }
     private void ParameterizeStochasticOperator(IOperator op) {

trunk/sources/HeuristicLab.Algorithms.SGA/3.3/SGAMainLoop.cs

@@ -31 +31 @@
 namespace HeuristicLab.Algorithms.SGA {
   /// <summary>
-  /// An operator which represents a Standard Genetic Algorithm.
+  /// An operator which represents the main loop of a Standard Genetic Algorithm.
   /// </summary>
-  [Item("SGAOperator", "An operator which represents a Standard Genetic Algorithm.")]
+  [Item("SGAMainLoop", "An operator which represents the main loop of a Standard Genetic Algorithm.")]
   [Creatable("Test")]
   [StorableClass]
-  public class SGAOperator : AlgorithmOperator {
+  public class SGAMainLoop : AlgorithmOperator {
     #region Parameter properties
     public ValueLookupParameter<IRandom> RandomParameter {
@@ -80 +80 @@
     #endregion
 
-    public SGAOperator()
+    public SGAMainLoop()
       : base() {
       #region Create parameters