Changeset 7879 for trunk

Timestamp:

05/23/12 16:29:46 (13 years ago)

Author:

abeham

Message:

#1782: Added best-known quality to Cordeau's instances

Location:

trunk/sources/HeuristicLab.Problems.Instances.CordeauGQAP/3.3

Files:

• CordeauGQAPInstanceProvider.cs (modified) (2 diffs)
• CordeauGQAPParser.cs (modified) (2 diffs)
• Data/CordeauGQAP.zip (modified) (previous)

trunk/sources/HeuristicLab.Problems.Instances.CordeauGQAP/3.3/CordeauGQAPInstanceProvider.cs

@@ -51 +51 @@
 
     private const string FileName = "CordeauGQAP";
-   
+
     public override IEnumerable<IDataDescriptor> GetDataDescriptors() {
       var instanceArchiveName = GetResourceName(FileName + @"\.zip");
@@ -98 +98 @@
     private GQAPData Load(CordeauGQAPParser parser) {
       var instance = new GQAPData();
+      instance.BestKnownQuality = parser.BestKnownQuality;
       instance.Equipments = parser.Equipments;
       instance.Locations = parser.Locations;

trunk/sources/HeuristicLab.Problems.Instances.CordeauGQAP/3.3/CordeauGQAPParser.cs

@@ -29 +29 @@
     public int Locations { get; private set; }
     public double TransportationCosts { get; private set; }
+    public double BestKnownQuality { get; private set; }
     public double[,] Weights { get; private set; }
     public double[,] Distances { get; private set; }
@@ -73 +74 @@
 
       line = Continue(reader);
+      double bkq;
+      if (!double.TryParse(line, out bkq))
+        BestKnownQuality = double.NaN;
+      else {
+        BestKnownQuality = bkq;
+        line = Continue(reader);
+      }
 
       Weights = new double[Equipments, Equipments];