Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
09/10/11 16:25:22 (13 years ago)
Author:
abeham
Message:

#1619

  • Updated the model slightly
  • Deployed the service
  • Updated the GUI to perform asynchronous calls to the service
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/GeneralizedQAP/HeuristicLab.Services.ProblemInstances/QAP/QAP.svc.cs

    r6659 r6733  
    2626    public string[] GetProblemInstances() {
    2727      using (ProblemInstancesEntities context = new ProblemInstancesEntities()) {
    28         return context.QAPInstances.Select(x => x.name).ToArray();
     28        return context.QAPInstances.Select(x => x.Name).ToArray();
    2929      }
    3030    }
     
    3232    public QAPInstanceDto GetProblemInstanceData(string instance) {
    3333      using (ProblemInstancesEntities context = new ProblemInstancesEntities()) {
    34         return new QAPInstanceDto(context.QAPInstances.Where(x => x.name == instance).Single());
     34        return new QAPInstanceDto(context.QAPInstances.Where(x => x.Name == instance).Single());
    3535      }
    3636    }
     
    3838    public QAPSolutionDto[] GetBestSolutionsData(string instance) {
    3939      using (ProblemInstancesEntities context = new ProblemInstancesEntities()) {
    40         QAPInstance qap = context.QAPInstances.Where(x => x.name == instance).SingleOrDefault();
     40        QAPInstance qap = context.QAPInstances.Where(x => x.Name == instance).SingleOrDefault();
    4141        if (qap == null) return new QAPSolutionDto[0];
     42        context.LoadProperty<QAPInstance>(qap, x => x.Solutions);
    4243        double best = double.NaN;
    43         if (qap.maximization) best = qap.QAPSolutions.Max(x => x.quality);
    44         else best = qap.QAPSolutions.Min(x => x.quality);
     44        if (!qap.Solutions.Any()) return new QAPSolutionDto[0];
    4545
    46         return qap.QAPSolutions.Where(x => x.quality == best).Select(x => new QAPSolutionDto(x)).ToArray();
     46        if (qap.Maximization) best = qap.Solutions.Max(x => x.Quality);
     47        else best = qap.Solutions.Min(x => x.Quality);
     48
     49        return qap.Solutions.Where(x => x.Quality == best).Select(x => new QAPSolutionDto(x)).ToArray();
    4750      }
    4851    }
Note: See TracChangeset for help on using the changeset viewer.