Changeset 14551 for branches/MemPRAlgorithm/HeuristicLab.Algorithms.MemPR/3.3/Permutation

Timestamp:

01/08/17 22:16:19 (8 years ago)

Author:

abeham

Message:

#2701: refactored breeding, removed hillclimbing after breeding

File:

• branches/MemPRAlgorithm/HeuristicLab.Algorithms.MemPR/3.3/Permutation/PermutationMemPR.cs (modified) (10 diffs)

branches/MemPRAlgorithm/HeuristicLab.Algorithms.MemPR/3.3/Permutation/PermutationMemPR.cs

@@ -395 +395 @@
     private ISingleObjectiveSolutionScope<Encodings.PermutationEncoding.Permutation> CrossAbsolute(ISingleObjectiveSolutionScope<Encodings.PermutationEncoding.Permutation> p1, ISingleObjectiveSolutionScope<Encodings.PermutationEncoding.Permutation> p2, CancellationToken token) {
       var cache = new HashSet<Encodings.PermutationEncoding.Permutation>(new PermutationEqualityComparer());
+      cache.Add(p1.Solution);
+      cache.Add(p2.Solution);
+
       var cacheHits = 0;
-      var evaluations = 1;
+      var evaluations = 0;
       ISingleObjectiveSolutionScope<Encodings.PermutationEncoding.Permutation> offspring = null;
-      for (; evaluations <= p1.Solution.Length; evaluations++) {
+      while (evaluations < p1.Solution.Length) {
         Encodings.PermutationEncoding.Permutation c = null;
         var xochoice = Context.Random.Next(3);
@@ -413 +416 @@
         var probe = ToScope(c);
         Evaluate(probe, token);
+        evaluations++;
         cache.Add(c);
         if (offspring == null || Context.IsBetter(probe, offspring)) {
@@ -420 +424 @@
         }
       }
-      Context.IncrementEvaluatedSolutions(evaluations-1);
+      Context.IncrementEvaluatedSolutions(evaluations);
       return offspring;
     }
@@ -426 +430 @@
     private ISingleObjectiveSolutionScope<Encodings.PermutationEncoding.Permutation> CrossRelativeDirected(ISingleObjectiveSolutionScope<Encodings.PermutationEncoding.Permutation> p1, ISingleObjectiveSolutionScope<Encodings.PermutationEncoding.Permutation> p2, CancellationToken token) {
       var cache = new HashSet<Encodings.PermutationEncoding.Permutation>(new PermutationEqualityComparer());
+      cache.Add(p1.Solution);
+      cache.Add(p2.Solution);
+
       var cacheHits = 0;
-      var evaluations = 1;
+      var evaluations = 0;
       ISingleObjectiveSolutionScope<Encodings.PermutationEncoding.Permutation> offspring = null;
-      for (; evaluations <= p1.Solution.Length; evaluations++) {
+      while(evaluations < p1.Solution.Length) {
         Encodings.PermutationEncoding.Permutation c = null;
         var xochoice = Context.Random.Next(3);
@@ -444 +451 @@
         var probe = ToScope(c);
         Evaluate(probe, token);
+        evaluations++;
         cache.Add(c);
         if (offspring == null || Context.IsBetter(probe, offspring)) {
@@ -451 +459 @@
         }
       }
-      Context.IncrementEvaluatedSolutions(evaluations-1);
+      Context.IncrementEvaluatedSolutions(evaluations);
       return offspring;
     }
@@ -457 +465 @@
     private ISingleObjectiveSolutionScope<Encodings.PermutationEncoding.Permutation> CrossRelativeUndirected(ISingleObjectiveSolutionScope<Encodings.PermutationEncoding.Permutation> p1, ISingleObjectiveSolutionScope<Encodings.PermutationEncoding.Permutation> p2, CancellationToken token) {
       var cache = new HashSet<Encodings.PermutationEncoding.Permutation>(new PermutationEqualityComparer());
+      cache.Add(p1.Solution);
+      cache.Add(p2.Solution);
+
       var cacheHits = 0;
-      var evaluations = 1;
+      var evaluations = 0;
       ISingleObjectiveSolutionScope<Encodings.PermutationEncoding.Permutation> offspring = null;
-      for (; evaluations <= p1.Solution.Length; evaluations++) {
+      while(evaluations <= p1.Solution.Length) {
         Encodings.PermutationEncoding.Permutation c = null;
         var xochoice = Context.Random.Next(3);
@@ -475 +486 @@
         var probe = ToScope(c);
         Evaluate(probe, token);
+        evaluations++;
         cache.Add(c);
         if (offspring == null || Context.IsBetter(probe, offspring)) {
@@ -482 +494 @@
         }
       }
-      Context.IncrementEvaluatedSolutions(evaluations-1);
+      Context.IncrementEvaluatedSolutions(evaluations);
       return offspring;
     }
 
     protected override ISingleObjectiveSolutionScope<Encodings.PermutationEncoding.Permutation> Link(ISingleObjectiveSolutionScope<Encodings.PermutationEncoding.Permutation> a, ISingleObjectiveSolutionScope<Encodings.PermutationEncoding.Permutation> b, CancellationToken token, bool delink = false) {
-      if (double.IsNaN(a.Fitness)) {
-        Evaluate(a, token);
-        Context.IncrementEvaluatedSolutions(1);
-      }
-      if (double.IsNaN(b.Fitness)) {
-        Evaluate(b, token);
-        Context.IncrementEvaluatedSolutions(1);
-      }
-
       var wrapper = new EvaluationWrapper<Encodings.PermutationEncoding.Permutation>(Problem, ToScope(null));
       double quality;
@@ -626 +629 @@
       Context.IncrementEvaluatedSolutions(evaluations);
 
-      if (VALIDATE && bestChild != null && !bestChild.Validate()) throw new ArgumentException("Relinking produced invalid child");
-      if (VALIDATE && Dist(child, p2) > 0) throw new InvalidOperationException("Child is not equal to p2 after relinking");
+      if (VALIDATE && bestChild != null && !bestChild.Validate()) throw new ArgumentException("Delinking produced invalid child");
 
       return bestChild ?? child;