Changeset 7445 for branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3

Timestamp:

02/03/12 16:19:24 (12 years ago)

Author:

abeham

Message:

#1614

• updated problem instance provider

File:

• branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/GeneralizedQuadraticAssignmentProblem.cs (modified) (1 diff)

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/GeneralizedQuadraticAssignmentProblem.cs

@@ -201 +201 @@
     }
 
-    public void LoadFrom(IQAPInstance format) {
-      Weights = new DoubleMatrix(format.Weights);
-      Distances = new DoubleMatrix(format.Distances);
-      InstallationCosts = new DoubleMatrix(Weights.Rows, Distances.Columns);
+    public void LoadFrom(IQAPInstance instance) {
+      Weights = new DoubleMatrix(instance.Weights);
+      Distances = new DoubleMatrix(instance.Distances);
+      InstallationCosts = new DoubleMatrix(Weights.Rows, Distances.Columns); // all zero
       Capacities = new DoubleArray(Enumerable.Range(0, Distances.Rows).Select(x => 1.0).ToArray());
       Demands = new DoubleArray(Enumerable.Range(0, Weights.Rows).Select(x => 1.0).ToArray());
 
-      if (format.BestKnownAssignment != null) {
-        var assignment = new IntegerVector(format.BestKnownAssignment);
-        double flowDistanceQuality, installationQuality, overbookedCapacity;
-        GQAPEvaluator.Evaluate(assignment, Weights, Distances, InstallationCosts, Demands, Capacities,
-          out flowDistanceQuality, out installationQuality, out overbookedCapacity);
-        double quality = GQAPEvaluator.GetCombinedQuality(flowDistanceQuality, installationQuality, overbookedCapacity, TransportationCosts.Value, OverbookedCapacityPenalty.Value);
-        BestKnownSolution = new GQAPSolution(assignment, new DoubleValue(quality), new DoubleValue(flowDistanceQuality), new DoubleValue(installationQuality), new DoubleValue(overbookedCapacity));
-        BestKnownQuality = new DoubleValue(quality);
-      }
+      TransportationCosts.Value = 1;
+
+      if (instance.BestKnownAssignment != null) {
+        EvaluateAndLoadAssignment(instance.BestKnownAssignment);
+      }
+    }
+
+    public void LoadFrom(ICTAPInstance instance) {
+      Capacities = new DoubleArray(instance.MemoryCapacities);
+      Demands = new DoubleArray(instance.MemoryRequirements);
+      Weights = new DoubleMatrix(instance.CommunicationCosts);
+      InstallationCosts = new DoubleMatrix(instance.ExecutionCosts);
+      Distances = new DoubleMatrix(Capacities.Length, Capacities.Length); // all one, except diagonal
+      for (int i = 0; i < Capacities.Length - 1; i++)
+        for (int j = i + 1; j < Capacities.Length; j++) {
+          Distances[i, j] = 1;
+          Distances[j, i] = 1;
+        }
+
+      TransportationCosts.Value = 1;
+
+      if (instance.BestKnownAssignment != null) {
+        EvaluateAndLoadAssignment(instance.BestKnownAssignment);
+      }
+    }
+
+    private void EvaluateAndLoadAssignment(int[] vector) {
+      var assignment = new IntegerVector(vector);
+      double flowDistanceQuality, installationQuality, overbookedCapacity;
+      GQAPEvaluator.Evaluate(assignment, Weights, Distances, InstallationCosts, Demands, Capacities,
+        out flowDistanceQuality, out installationQuality, out overbookedCapacity);
+      double quality = GQAPEvaluator.GetCombinedQuality(flowDistanceQuality, installationQuality, overbookedCapacity, TransportationCosts.Value, OverbookedCapacityPenalty.Value);
+      BestKnownSolution = new GQAPSolution(assignment, new DoubleValue(quality), new DoubleValue(flowDistanceQuality), new DoubleValue(installationQuality), new DoubleValue(overbookedCapacity));
+      BestKnownQuality = new DoubleValue(quality);
     }