Ignore:
Timestamp:
02/24/12 23:27:06 (8 years ago)
Author:
abeham
Message:

#1614

  • sorted operators
  • added crossover defined by Cordeau et al.
  • fixed a few bugs
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/GeneralizedQAP/HeuristicLab.Problems.Instances.CordeauGQAP/3.3/CordeauGQAPInstanceProvider.cs

    r7505 r7523  
    6161      using (var stream = Assembly.GetExecutingAssembly()
    6262        .GetManifestResourceStream(descriptor.InstanceIdentifier)) {
    63         var datParser = new CordeauGQAPParser();
    64         datParser.Parse(stream);
    65         if (datParser.Error != null) throw datParser.Error;
    66         instance.Equipments = datParser.Equipments;
    67         instance.Locations = datParser.Locations;
    68         instance.Weights = datParser.Weights;
    69         instance.Distances = datParser.Distances;
    70         instance.InstallationCosts = datParser.InstallationCosts;
    71         instance.TransportationCosts = datParser.TransportationCosts;
     63        var parser = new CordeauGQAPParser();
     64        parser.Parse(stream);
     65        if (parser.Error != null) throw parser.Error;
     66        instance.Equipments = parser.Equipments;
     67        instance.Locations = parser.Locations;
     68        instance.Demands = parser.Demands;
     69        instance.Capacities = parser.Capacities;
     70        instance.Weights = parser.Weights;
     71        instance.Distances = parser.Distances;
     72        instance.InstallationCosts = parser.InstallationCosts;
     73        instance.TransportationCosts = parser.TransportationCosts;
    7274
    7375        instance.Name = id.Name;
Note: See TracChangeset for help on using the changeset viewer.