Changeset 7407 for branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Evaluators

Timestamp:

01/24/12 17:23:21 (13 years ago)

Author:

abeham

Message:

#1614: worked on GQAP

Location:

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Evaluators

Files:

• GQAPEvaluator.cs (modified) (3 diffs)
• GQAPNMoveEvaluator.cs (added)

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Evaluators/GQAPEvaluator.cs

@@ -87 +87 @@
     }
 
+    public static DoubleValue Evaluate(IntegerVector assignment, DoubleMatrix weights, DoubleMatrix distances,
+      DoubleMatrix installCosts, double transportCosts, DoubleArray demands, DoubleArray capacities,
+      out double infeasibility) {
+      double quality = 0;
+      int len = assignment.Length;
+      var slack = (DoubleArray)capacities.Clone();
+      for (int i = 0; i < len; i++) {
+        quality += installCosts[i, assignment[i]];
+        for (int j = 0; j < len; j++) {
+          quality += transportCosts * weights[i, j] * distances[assignment[i], assignment[j]];
+        }
+        slack[assignment[i]] -= demands[i];
+      }
+
+      infeasibility = -slack.Where(x => x < 0).Sum();
+      return new DoubleValue(quality);
+    }
+
     public override IOperation Apply() {
       IntegerVector assignment = AssignmentParameter.ActualValue;
@@ -96 +114 @@
       DoubleArray capacities = (DoubleArray)CapacitiesParameter.ActualValue.Clone();
       double penalty = PenaltyParameter.ActualValue.Value;
-      double quality = 0;
-      double infeasibility = 0;
 
       if (weights.Rows != weights.Columns || distances.Rows != distances.Columns
@@ -104 +120 @@
         throw new InvalidOperationException("ERROR: The problem configuration is not valid! Check the sizes of the weights (NxN), distances (MxM) and installation costs (NxM) matrices as well as the length of the demand (N) and capacities (M) vectors.");
 
-      int len = assignment.Length;
-      for (int i = 0; i < len; i++) {
-        quality += installCosts[i, assignment[i]];
-        for (int j = 0; j < len; j++) {
-          quality += transportCosts * weights[i, j] * distances[assignment[i], assignment[j]];
-        }
-        capacities[assignment[i]] -= demands[i];
-      }
-
-      infeasibility = -capacities.Where(x => x < 0).Sum();
+      double infeasibility;
+      var quality = Evaluate(assignment, weights, distances, installCosts, transportCosts, demands, capacities, out infeasibility);
 
       InfeasibilityParameter.ActualValue = new DoubleValue(infeasibility);
-      QualityParameter.ActualValue = new DoubleValue(quality + penalty * infeasibility);
+      QualityParameter.ActualValue = new DoubleValue(quality.Value + penalty * infeasibility);
       return base.Apply();
     }