Changeset 13192

Timestamp:

11/16/15 21:30:18 (9 years ago)

Author:

abeham

Message:

#2445: merged r12811 to stable

Location:

stable/HeuristicLab.Problems.QuadraticAssignment/3.3/LocalImprovement

Files:

• QAPExhaustiveInversionLocalImprovement.cs (modified) (1 diff)
• QAPStochasticScrambleLocalImprovement.cs (modified) (1 diff)

stable/HeuristicLab.Problems.QuadraticAssignment/3.3/LocalImprovement/QAPExhaustiveInversionLocalImprovement.cs

@@ -108 +108 @@
           }
         }
-        evaluatedSolutions.Value = (int)Math.Ceiling(evaluations);
+        evaluatedSolutions.Value += (int)Math.Ceiling(evaluations);
         if (bestMove == null) break;
         InversionManipulator.Apply(assignment, bestMove.Index1, bestMove.Index2);

stable/HeuristicLab.Problems.QuadraticAssignment/3.3/LocalImprovement/QAPStochasticScrambleLocalImprovement.cs

@@ -119 +119 @@
           }
         }
-        evaluatedSolutions.Value = (int)Math.Ceiling(evaluations);
+        evaluatedSolutions.Value += (int)Math.Ceiling(evaluations);
         if (bestMove == null) break;
         ScrambleManipulator.Apply(assignment, bestMove.StartIndex, bestMove.ScrambledIndices);