Changeset 15555 for branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/SolutionCreators/RandomButFeasibleSolutionCreator.cs

Timestamp:

12/20/17 23:35:23 (6 years ago)

Author:

abeham

Message:

#1614: finished checking the implementation against the paper

File:

• branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/SolutionCreators/RandomButFeasibleSolutionCreator.cs (modified) (3 diffs)

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/SolutionCreators/RandomButFeasibleSolutionCreator.cs

@@ -65 +65 @@
       int counter = 0;
       double minViolation = double.MaxValue;
-      var slack = new DoubleArray(capacities.Length);
-      var assignment = new IntegerVector(demands.Length);
+      var slack = new double[capacities.Length];
+      var assignment = new int[demands.Length];
 
       while (!isFeasible) {
@@ -86 +86 @@
         isFeasible = violation == 0;
         if (isFeasible || violation < minViolation) {
-          result = (IntegerVector)assignment.Clone();
+          result = new IntegerVector(assignment);
           minViolation = violation;
         }
@@ -100 +100 @@
     }
 
-    private static IEnumerable<int> GetFreeLocations(int equipment, DoubleArray demands, DoubleArray freeCapacities) {
+    private static IEnumerable<int> GetFreeLocations(int equipment, DoubleArray demands, double[] freeCapacities) {
       var freeLocations = freeCapacities
         .Select((v, idx) => new KeyValuePair<int, double>(idx, v))