Changeset 7523 for branches/GeneralizedQAP/HeuristicLab.Problems.Instances.CordeauGQAP

Timestamp:

02/24/12 23:27:06 (12 years ago)

Author:

abeham

Message:

#1614

• sorted operators
• added crossover defined by Cordeau et al.
• fixed a few bugs

Location:

branches/GeneralizedQAP/HeuristicLab.Problems.Instances.CordeauGQAP/3.3

Files:

• CordeauGQAPInstance.cs (modified) (1 diff)
• CordeauGQAPInstanceProvider.cs (modified) (1 diff)

branches/GeneralizedQAP/HeuristicLab.Problems.Instances.CordeauGQAP/3.3/CordeauGQAPInstance.cs

@@ -34 +34 @@
 
     public double TransportationCosts { get; set; }
+
+    public int[] BestKnownAssignment { get; set; }
+    public double? BestKnownQuality { get; set; }
   }
 }

branches/GeneralizedQAP/HeuristicLab.Problems.Instances.CordeauGQAP/3.3/CordeauGQAPInstanceProvider.cs

@@ -61 +61 @@
       using (var stream = Assembly.GetExecutingAssembly()
         .GetManifestResourceStream(descriptor.InstanceIdentifier)) {
-        var datParser = new CordeauGQAPParser();
-        datParser.Parse(stream);
-        if (datParser.Error != null) throw datParser.Error;
-        instance.Equipments = datParser.Equipments;
-        instance.Locations = datParser.Locations;
-        instance.Weights = datParser.Weights;
-        instance.Distances = datParser.Distances;
-        instance.InstallationCosts = datParser.InstallationCosts;
-        instance.TransportationCosts = datParser.TransportationCosts;
+        var parser = new CordeauGQAPParser();
+        parser.Parse(stream);
+        if (parser.Error != null) throw parser.Error;
+        instance.Equipments = parser.Equipments;
+        instance.Locations = parser.Locations;
+        instance.Demands = parser.Demands;
+        instance.Capacities = parser.Capacities;
+        instance.Weights = parser.Weights;
+        instance.Distances = parser.Distances;
+        instance.InstallationCosts = parser.InstallationCosts;
+        instance.TransportationCosts = parser.TransportationCosts;
 
         instance.Name = id.Name;