Ignore:
Timestamp:
02/02/18 16:31:42 (20 months 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 copied

Legend:

Unmodified
Added
Removed
  • branches/1614_GeneralizedQAP/HeuristicLab.Analysis.FitnessLandscape/3.3/ProblemCharacteristicAnalysis/IntegerVectorPathAnalysis.cs

    r15702 r15713  
    11using System;
    22using System.Collections.Generic;
    3 using HeuristicLab.Encodings.PermutationEncoding;
     3using HeuristicLab.Encodings.IntegerVectorEncoding;
    44
    55namespace HeuristicLab.Analysis.FitnessLandscape {
    6   public static class PermutationPathAnalysis {
    7     public static CurveAnalysisResult GetCharacteristics(List<List<Tuple<Permutation, double>>> trajectories) {
    8       return CurveAnalysis<Permutation>.GetCharacteristics(trajectories, Dist);
     6  public static class IntegerVectorPathAnalysis {
     7    public static CurveAnalysisResult GetCharacteristics(List<List<Tuple<IntegerVector, double>>> trajectories) {
     8      return CurveAnalysis<IntegerVector>.GetCharacteristics(trajectories, Dist);
    99    }
    1010
    11     private static double Dist(Permutation a, Permutation b) {
     11    private static double Dist(IntegerVector a, IntegerVector b) {
    1212      var dist = 0;
    1313      for (var i = 0; i < a.Length; i++)
Note: See TracChangeset for help on using the changeset viewer.