Changeset 2882 for trunk/sources/HeuristicLab.Evolutionary

Timestamp:

02/27/10 03:35:11 (15 years ago)

Author:

swagner

Message:

Operator architecture refactoring (#95)

• worked on algorithms

File:

• trunk/sources/HeuristicLab.Evolutionary/3.3/PopulationCreator.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Evolutionary/3.3/PopulationCreator.cs

@@ -41 +41 @@
       get { return (ValueLookupParameter<IOperator>)Parameters["SolutionCreator"]; }
     }
-    public ValueLookupParameter<IOperator> SolutionEvaluatorParameter {
-      get { return (ValueLookupParameter<IOperator>)Parameters["SolutionEvaluator"]; }
+    public ValueLookupParameter<IOperator> EvaluatorParameter {
+      get { return (ValueLookupParameter<IOperator>)Parameters["Evaluator"]; }
     }
     private ScopeParameter CurrentScopeParameter {
@@ -55 +55 @@
       Parameters.Add(new ValueLookupParameter<IntData>("PopulationSize", "The number of individuals that should be created."));
       Parameters.Add(new ValueLookupParameter<IOperator>("SolutionCreator", "The operator which is used to create new solutions."));
-      Parameters.Add(new ValueLookupParameter<IOperator>("SolutionEvaluator", "The operator which is used to evaluate 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."));
     }
@@ -62 +62 @@
       int size = PopulationSizeParameter.ActualValue.Value;
       IOperator creator = SolutionCreatorParameter.ActualValue;
-      IOperator evaluator = SolutionEvaluatorParameter.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.");