Changeset 7448 for branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/GeneralizedQuadraticAssignmentProblem.cs

Timestamp:

02/03/12 18:22:41 (12 years ago)

Author:

abeham

Message:

#1614

• Added Transpose() extension method for double[,] matrices
• Added IProblemInstanceConsumer<T> interface
• Implemented general ProblemView which auto-detects all instances a problem can consume
• Added ability of IProblemInstanceProvider to directly feed a consumer
• Implemented general view for problem instance providers
• Fixed a few bugs

File:

• branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/GeneralizedQuadraticAssignmentProblem.cs (modified) (7 diffs)

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

@@ -31 +31 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.PluginInfrastructure;
+using HeuristicLab.Problems.GeneralizedQuadraticAssignment.Common;
 using HeuristicLab.Problems.Instances;
 
@@ -37 +38 @@
   [Creatable("Problems")]
   [StorableClass]
-  public sealed class GeneralizedQuadraticAssignmentProblem : SingleObjectiveHeuristicOptimizationProblem<IGQAPEvaluator, IGQAPSolutionCreator>, IStorableContent {
+  public sealed class GeneralizedQuadraticAssignmentProblem : SingleObjectiveHeuristicOptimizationProblem<IGQAPEvaluator, IGQAPSolutionCreator>, IStorableContent, IProblemInstanceConsumer<IQAPInstance>, IProblemInstanceConsumer<ICTAPInstance> {
 
     public override Image ItemImage {
@@ -138 +139 @@
       set { BestKnownSolutionParameter.Value = value; }
     }
+    public GQAPAssignmentArchive BestKnownSolutions {
+      get { return BestKnownSolutionsParameter.Value; }
+      set { BestKnownSolutionsParameter.Value = value; }
+    }
     #endregion
 
@@ -202 +207 @@
 
     public void LoadFrom(IQAPInstance instance) {
+      Name = instance.Name;
+      Description = instance.Description;
+
       Weights = new DoubleMatrix(instance.Weights);
       Distances = new DoubleMatrix(instance.Distances);
@@ -212 +220 @@
       if (instance.BestKnownAssignment != null) {
         EvaluateAndLoadAssignment(instance.BestKnownAssignment);
+      } else {
+        BestKnownQuality = null;
+        BestKnownSolution = null;
+        BestKnownSolutions = null;
       }
     }
 
     public void LoadFrom(ICTAPInstance instance) {
+      Name = instance.Name;
+      Description = instance.Description;
+
       Capacities = new DoubleArray(instance.MemoryCapacities);
       Demands = new DoubleArray(instance.MemoryRequirements);
       Weights = new DoubleMatrix(instance.CommunicationCosts);
-      InstallationCosts = new DoubleMatrix(instance.ExecutionCosts);
+      InstallationCosts = new DoubleMatrix(instance.ExecutionCosts.Transpose());
       Distances = new DoubleMatrix(Capacities.Length, Capacities.Length); // all one, except diagonal
       for (int i = 0; i < Capacities.Length - 1; i++)
@@ -231 +246 @@
       if (instance.BestKnownAssignment != null) {
         EvaluateAndLoadAssignment(instance.BestKnownAssignment);
+      } else {
+        BestKnownQuality = null;
+        BestKnownSolution = null;
+        BestKnownSolutions = null;
       }
     }
@@ -242 +261 @@
       BestKnownSolution = new GQAPSolution(assignment, new DoubleValue(quality), new DoubleValue(flowDistanceQuality), new DoubleValue(installationQuality), new DoubleValue(overbookedCapacity));
       BestKnownQuality = new DoubleValue(quality);
+      BestKnownSolutions = new GQAPAssignmentArchive(EquipmentNames, LocationNames, Distances, Weights, InstallationCosts, Demands, Capacities, TransportationCosts, OverbookedCapacityPenalty);
+      BestKnownSolutions.Solutions.Add((GQAPSolution)BestKnownSolution.Clone());
     }