Changeset 15289 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Selector/LexicaseSelector.cs

Timestamp:

07/26/17 19:34:13 (7 years ago)

Author:

pkimmesw

Message:

#2665 Fixed analyzer, fixed Plush encoding + operators, adpated print evaluation according to McPhee

Location:

branches/PushGP/HeuristicLab.PushGP

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.ProgramSynthesis/Push/Selector/LexicaseSelector.cs (modified) (1 diff)

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Selector/LexicaseSelector.cs

@@ -60 +60 @@
 
     protected override IScope[] Select(List<IScope> population) {
-      var count = NumberOfSelectedSubScopesParameter.ActualValue.Value;
-      var copy = CopySelectedParameter.Value.Value;
-      var maximization = MaximizationParameter.ActualValue.Value;
-      var random = RandomParameter.ActualValue;
+      var selected = Apply(
+        population,
+        NumberOfSelectedSubScopesParameter.ActualValue.Value,
+        CopySelectedParameter.Value.Value,
+        MaximizationParameter.ActualValue.Value,
+        RandomParameter.ActualValue,
+        CaseQualitiesParameter.ActualValue);
+
+      return selected;
+    }
+
+    public static IScope[] Apply(
+      List<IScope> population,
+      int count,
+      bool copy,
+      bool maximization,
+      IRandom random,
+      ItemArray<DoubleArray> caseQualities) {
       var selected = new IScope[count];
-      var caseQualities = CaseQualitiesParameter.ActualValue;
       var repeats = (int)Math.Ceiling(count / (double)population.Count);
       var caseCount = caseQualities[0].Length;