Changeset 3023

Timestamp:

03/14/10 23:32:27 (15 years ago)

Author:

swagner

Message:

Renamed PopulationCreator to SolutionsCreator (#911)

Location:

trunk/sources

Files:

• HeuristicLab.Algorithms.SGA/3.3/SGA.cs (modified) (6 diffs)
• HeuristicLab.Optimization.Operators/3.3/HeuristicLab.Optimization.Operators-3.3.csproj (modified) (1 diff)
• HeuristicLab.Optimization.Operators/3.3/SolutionsCreator.cs (moved) (moved from trunk/sources/HeuristicLab.Optimization.Operators/3.3/PopulationCreator.cs) (2 diffs)

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

@@ -120 +120 @@
       get { return (RandomCreator)OperatorGraph.InitialOperator; }
     }
-    private PopulationCreator PopulationCreator {
-      get { return (PopulationCreator)RandomCreator.Successor; }
+    private SolutionsCreator SolutionsCreator {
+      get { return (SolutionsCreator)RandomCreator.Successor; }
     }
     private SGAMainLoop SGAMainLoop {
-      get { return (SGAMainLoop)PopulationCreator.Successor; }
+      get { return (SGAMainLoop)SolutionsCreator.Successor; }
     }
     private List<ISelector> selectors;
@@ -145 +145 @@
 
       RandomCreator randomCreator = new RandomCreator();
-      PopulationCreator populationCreator = new PopulationCreator();
+      SolutionsCreator solutionsCreator = new SolutionsCreator();
       SGAMainLoop sgaMainLoop = new SGAMainLoop();
       OperatorGraph.InitialOperator = randomCreator;
@@ -154 +154 @@
       randomCreator.SetSeedRandomlyParameter.ActualName = SetSeedRandomlyParameter.Name;
       randomCreator.SetSeedRandomlyParameter.Value = null;
-      randomCreator.Successor = populationCreator;
-
-      populationCreator.PopulationSizeParameter.ActualName = PopulationSizeParameter.Name;
-      populationCreator.Successor = sgaMainLoop;
+      randomCreator.Successor = solutionsCreator;
+
+      solutionsCreator.NumberOfSolutionsParameter.ActualName = PopulationSizeParameter.Name;
+      solutionsCreator.Successor = sgaMainLoop;
 
       sgaMainLoop.SelectorParameter.ActualName = SelectorParameter.Name;
@@ -184 +184 @@
       ParameterizeStochasticOperator(Problem.Evaluator);
       foreach (IOperator op in Problem.Operators) ParameterizeStochasticOperator(op);
-      ParameterizePopulationCreator();
+      ParameterizeSolutionsCreator();
       ParameterizeSGAMainLoop();
       ParameterizeSelectors();
@@ -194 +194 @@
     protected override void Problem_SolutionCreatorChanged(object sender, EventArgs e) {
       ParameterizeStochasticOperator(Problem.SolutionCreator);
-      ParameterizePopulationCreator();
+      ParameterizeSolutionsCreator();
       base.Problem_SolutionCreatorChanged(sender, e);
     }
     protected override void Problem_EvaluatorChanged(object sender, EventArgs e) {
       ParameterizeStochasticOperator(Problem.Evaluator);
-      ParameterizePopulationCreator();
+      ParameterizeSolutionsCreator();
       ParameterizeSGAMainLoop();
       ParameterizeSelectors();
@@ -244 +244 @@
     }
 
-    private void ParameterizePopulationCreator() {
-      PopulationCreator.EvaluatorParameter.ActualName = Problem.EvaluatorParameter.Name;
-      PopulationCreator.SolutionCreatorParameter.ActualName = Problem.SolutionCreatorParameter.Name;
+    private void ParameterizeSolutionsCreator() {
+      SolutionsCreator.EvaluatorParameter.ActualName = Problem.EvaluatorParameter.Name;
+      SolutionsCreator.SolutionCreatorParameter.ActualName = Problem.SolutionCreatorParameter.Name;
     }
     private void ParameterizeSGAMainLoop() {

trunk/sources/HeuristicLab.Optimization.Operators/3.3/HeuristicLab.Optimization.Operators-3.3.csproj

@@ -82 +82 @@
   <ItemGroup>
     <Compile Include="HeuristicLabOptimizationOperatorsPlugin.cs" />
-    <Compile Include="PopulationCreator.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ChildrenCreator.cs" />
+    <Compile Include="SolutionsCreator.cs" />
   </ItemGroup>
   <ItemGroup>

trunk/sources/HeuristicLab.Optimization.Operators/3.3/SolutionsCreator.cs

@@ -29 +29 @@
 namespace HeuristicLab.Optimization.Operators {
   /// <summary>
-  /// An operator which creates a new population of solutions.
+  /// An operator which creates new solutions.
   /// </summary>
-  [Item("PopulationCreator", "An operator which creates a new population of solutions.")]
+  [Item("SolutionsCreator", "An operator which creates new solutions.")]
   [StorableClass]
   [Creatable("Test")]
-  public sealed class PopulationCreator : SingleSuccessorOperator {
-    public ValueLookupParameter<IntData> PopulationSizeParameter {
-      get { return (ValueLookupParameter<IntData>)Parameters["PopulationSize"]; }
+  public sealed class SolutionsCreator : SingleSuccessorOperator {
+    public ValueLookupParameter<IntData> NumberOfSolutionsParameter {
+      get { return (ValueLookupParameter<IntData>)Parameters["NumberOfSolutions"]; }
     }
     public ValueLookupParameter<IOperator> SolutionCreatorParameter {
@@ -51 +51 @@
     }
 
-    public PopulationCreator()
+    public SolutionsCreator()
       : base() {
-      Parameters.Add(new ValueLookupParameter<IntData>("PopulationSize", "The number of individuals that should be created."));
+      Parameters.Add(new ValueLookupParameter<IntData>("NumberOfSolutions", "The number of solutions that should be created."));
       Parameters.Add(new ValueLookupParameter<IOperator>("SolutionCreator", "The operator which is used to create new solutions."));
       Parameters.Add(new ValueLookupParameter<IOperator>("Evaluator", "The operator which is used to evaluate new solutions."));
-      Parameters.Add(new ScopeParameter("CurrentScope", "The current scope which represents the population."));
+      Parameters.Add(new ScopeParameter("CurrentScope", "The current scope to which the new solutions are added as sub-scopes."));
     }
 
     public override IOperation Apply() {
-      int size = PopulationSizeParameter.ActualValue.Value;
+      int count = NumberOfSolutionsParameter.ActualValue.Value;
       IOperator creator = SolutionCreatorParameter.ActualValue;
       IOperator evaluator = EvaluatorParameter.ActualValue;
 
-      if (CurrentScope.SubScopes.Count > 0) throw new InvalidOperationException("Population is not empty. PopulationCreator cannot be applied on scopes which already contain sub-scopes.");
-
-      for (int i = 0; i < size; i++)
-        CurrentScope.SubScopes.Add(new Scope(i.ToString()));
+      int current = CurrentScope.SubScopes.Count;
+      for (int i = 0; i < count; i++)
+        CurrentScope.SubScopes.Add(new Scope((current + i).ToString()));
 
       OperationCollection next = new OperationCollection();
-      for (int i = 0; i < CurrentScope.SubScopes.Count; i++) {
-        if (creator != null) next.Add(ExecutionContext.CreateOperation(creator, CurrentScope.SubScopes[i]));
-        if (evaluator != null) next.Add(ExecutionContext.CreateOperation(evaluator, CurrentScope.SubScopes[i]));
+      for (int i = 0; i < count; i++) {
+        if (creator != null) next.Add(ExecutionContext.CreateOperation(creator, CurrentScope.SubScopes[current + i]));
+        if (evaluator != null) next.Add(ExecutionContext.CreateOperation(evaluator, CurrentScope.SubScopes[current + i]));
       }
       next.Add(base.Apply());