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

Timestamp:

09/17/17 23:27:05 (7 years ago)

Author:

pkimmesw

Message:

#2665 Solution Cleanup

File:

• branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Selector/LexicaseSelector.cs (modified) (3 diffs)

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

@@ -64 +64 @@
       var random = RandomParameter.ActualValue;
       var maximization = MaximizationParameter.ActualValue.Value;
-
-      //var qualities = QualityParameter.ActualValue;
-      //.Where(x => IsValidQuality(x.Value))
-      //.Select(x => x.Value)
-      //.ToList();
-
       var caseQualities = CaseQualitiesParameter.ActualValue.ToList();
 
@@ -98 +92 @@
       }
 
-      if (caseQualities.Any(x => x.Length != caseQualities[0].Length)) {
+      var qualitiesLength = caseQualities[0].Length;
+
+      if (caseQualities.Any(x => x.Length != qualitiesLength)) {
         throw new ArgumentException("Not all case qualities have the same length");
       }
 
       var selected = new IScope[count];
-      var candidates = Enumerable.Range(0, caseQualities.Count).ToList();
-      var orderSource = Enumerable.Range(0, caseQualities[0].Length).ToList();
+
+      var candidates = new List<int>(caseQualities.Count);
+      for (var i = 0; i < caseQualities.Count; i++) candidates.Add(i);
+
+      var orderSource = new List<int>(qualitiesLength);
+      for (var i = 0; i < qualitiesLength; i++) orderSource.Add(i);
 
       for (var i = 0; i < count; i++) {
@@ -140 +140 @@
           : double.PositiveInfinity;
 
-        foreach (var candidate in candidates) {
-          if (caseQualities[candidate][curCase].IsAlmost(best)) {
+        for (var i = 0; i < candidates.Count; i++) {
+          var candidate = candidates[i];
+          var caseQuality = caseQualities[candidate][curCase];
+
+          if (caseQuality.IsAlmost(best)) {
             // if the individuals is as good as the best one, add it
             nextCandidates.Add(candidate);
           } else if (
-             (maximization && (caseQualities[candidate][curCase] > best)) ||
-             (!maximization && (caseQualities[candidate][curCase] < best))) {
-            // if the individuals is better than the best one, remove all previous candidates and add the new one
+             (maximization && (caseQuality > best)) ||
+             (!maximization && (caseQuality < best))) {
+            // if the individual is better than the best one, remove all previous candidates and add the new one
             nextCandidates.Clear();
             nextCandidates.Add(candidate);
             // also set the next best quality value
-            best = caseQualities[candidate][curCase];
+            best = caseQuality;
           }
           // else {do nothing}