Changeset 13408 for branches/ProblemRefactoring/HeuristicLab.Tests/HeuristicLab.Scripting-3.3/Script Sources/GAQAPScriptSource.cs

Timestamp:

11/26/15 17:36:54 (9 years ago)

Author:

mkommend

Message:

#2521: Adapted unit tests in problem refactoring branch.

File:

• branches/ProblemRefactoring/HeuristicLab.Tests/HeuristicLab.Scripting-3.3/Script Sources/GAQAPScriptSource.cs (modified) (2 diffs)

branches/ProblemRefactoring/HeuristicLab.Tests/HeuristicLab.Scripting-3.3/Script Sources/GAQAPScriptSource.cs

@@ -42 +42 @@
     for (int i = 0; i < popSize; i++) {
       population[i] = new Permutation(PermutationTypes.Absolute, qap.Weights.Rows, random);
-      qualities[i] = QAPEvaluator.Apply(population[i], qap.Weights, qap.Distances);
+      qualities[i] = qap.Evaluate(population[i]);
     }
     var bestQuality = qualities.Min();
@@ -52 +52 @@
         nextGen[i] = PartiallyMatchedCrossover.Apply(random, parents[i * 2], parents[i * 2 + 1]);
         if (random.NextDouble() < mutationRate) Swap2Manipulator.Apply(random, nextGen[i]);
-        nextQual[i] = QAPEvaluator.Apply(nextGen[i], qap.Weights, qap.Distances);
+        nextQual[i] = qap.Evaluate(nextGen[i]);
         if (nextQual[i] < bestQuality) {
           bestQuality = nextQual[i];