Ignore:
Timestamp:
02/02/18 16:31:42 (4 years ago)
Author:
abeham
Message:

#1614:

  • added additional constraint to benchmark data generator and updated one instance that was affected by this
  • added fitness landscape characteristics for the GQAP
  • fixed RLD analysis view to compensate for empty convergence graphs
  • fixed CPLEX solvers not using the obj value when the solver terminates (callback is not called if proven optimal solution is found)
  • added code for local solver to also check on final quality
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/1614_GeneralizedQAP/BenchmarkDataGenerator/Program.cs

    r15578 r15713  
    9292                gqapCapacities[i] = (int)Math.Round(gqapCapacities[i] / total * totalCap);
    9393              }
     94              var maxCap = gqapCapacities.Max();
    9495              // locations should be able to accomodate at least one equipment
    9596              // and one location should not be able to accomodate all equipments
    96               if (gqapCapacities.All(x => x >= minDemand && x < totalDemand)) break;
    97               else Console.WriteLine("{0}-{1}-{2}: Another try", qap.Name, k, fac);
     97              // equipments must all fit at least into the biggest location
     98              // note: this should lead to mostly feasible instances, but is not a guarantee
     99              if (gqapCapacities.All(x => x >= minDemand && x < totalDemand)
     100                && gqapDemands.All(x => x <= maxCap)) {
     101                break;
     102              } else Console.WriteLine("{0}-{1}-{2}: Another try", qap.Name, k, fac);
    98103            }
    99104            var fname = qap.Name + "-" + k + "-" + fac;
Note: See TracChangeset for help on using the changeset viewer.