Changeset 7879


Ignore:
Timestamp:
05/23/12 16:29:46 (10 years ago)
Author:
abeham
Message:

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

Location:
trunk/sources/HeuristicLab.Problems.Instances.CordeauGQAP/3.3
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Problems.Instances.CordeauGQAP/3.3/CordeauGQAPInstanceProvider.cs

    r7638 r7879  
    5151
    5252    private const string FileName = "CordeauGQAP";
    53    
     53
    5454    public override IEnumerable<IDataDescriptor> GetDataDescriptors() {
    5555      var instanceArchiveName = GetResourceName(FileName + @"\.zip");
     
    9898    private GQAPData Load(CordeauGQAPParser parser) {
    9999      var instance = new GQAPData();
     100      instance.BestKnownQuality = parser.BestKnownQuality;
    100101      instance.Equipments = parser.Equipments;
    101102      instance.Locations = parser.Locations;
  • trunk/sources/HeuristicLab.Problems.Instances.CordeauGQAP/3.3/CordeauGQAPParser.cs

    r7538 r7879  
    2929    public int Locations { get; private set; }
    3030    public double TransportationCosts { get; private set; }
     31    public double BestKnownQuality { get; private set; }
    3132    public double[,] Weights { get; private set; }
    3233    public double[,] Distances { get; private set; }
     
    7374
    7475      line = Continue(reader);
     76      double bkq;
     77      if (!double.TryParse(line, out bkq))
     78        BestKnownQuality = double.NaN;
     79      else {
     80        BestKnownQuality = bkq;
     81        line = Continue(reader);
     82      }
    7583
    7684      Weights = new double[Equipments, Equipments];
Note: See TracChangeset for help on using the changeset viewer.