Changeset 8553


Ignore:
Timestamp:
09/01/12 22:32:07 (7 years ago)
Author:
abeham
Message:

#1890: Updated best known qualities of missing QAPLIB solutions

Location:
trunk/sources
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Problems.Instances.QAPLIB/3.3/QAPLIBInstanceProvider.cs

    r8192 r8553  
    6565      "esc16j",
    6666      "esc32a",
     67      "esc32b",
     68      "esc32c",
     69      "esc32d",
    6770      "esc32e",
    6871      "esc32f",
    6972      "esc32g",
     73      "esc32h",
    7074      "had12",
    7175      "had14",
     
    126130      "tai25a",
    127131      "tai25b",
     132      "tai30a",
    128133      "tai30b",
     134      "tai35a",
    129135      "tai35b",
     136      "tai40a",
    130137      "tai40b",
    131138      "tai50a",
     
    204211
    205212                int[] assignment = slnParser.Assignment;
    206                 if (reversedSolutions.Contains(instance.Name)) {
     213                if (assignment != null && reversedSolutions.Contains(instance.Name)) {
    207214                  assignment = (int[])slnParser.Assignment.Clone();
    208215                  for (int i = 0; i < assignment.Length; i++)
  • trunk/sources/HeuristicLab.Problems.Instances.QAPLIB/3.3/QAPLIBSolutionParser.cs

    r7445 r8553  
    9090          string valLine = reader.ReadLine();
    9191          string[] vals = valLine.Split(delim, StringSplitOptions.RemoveEmptyEntries);
     92          if (vals.Length == 0) continue;
    9293          for (int j = 0; j < vals.Length; j++) {
    9394            if (valueAsLocation)
     
    9697          }
    9798        }
     99        if (read < Size) Assignment = null;
    98100        return true;
    99101      } catch (Exception e) {
  • trunk/sources/HeuristicLab.Problems.QuadraticAssignment/3.3/QuadraticAssignmentProblem.cs

    r7877 r8553  
    412412      Description = data.Description;
    413413      Load(weights, distances);
     414      if (data.BestKnownQuality.HasValue) BestKnownQuality = new DoubleValue(data.BestKnownQuality.Value);
    414415      EvaluateAndLoadAssignment(data.BestKnownAssignment);
    415416      OnReset();
     
    426427      Description = data.Description;
    427428      Load(weights, distances);
     429      if (data.BestKnownQuality.HasValue) BestKnownQuality = new DoubleValue(data.BestKnownQuality.Value);
    428430      EvaluateAndLoadAssignment(data.BestKnownTour);
    429431      OnReset();
Note: See TracChangeset for help on using the changeset viewer.