Changeset 15713 for branches/1614_GeneralizedQAP/HeuristicLab.Analysis.FitnessLandscape/3.3/ProblemCharacteristicAnalysis/IntegerVectorPathAnalysis.cs

Timestamp:

02/02/18 16:31:42 (5 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:

• branches/1614_GeneralizedQAP/HeuristicLab.Analysis.FitnessLandscape/3.3/ProblemCharacteristicAnalysis/IntegerVectorPathAnalysis.cs (copied) (copied from branches/1614_GeneralizedQAP/HeuristicLab.Analysis.FitnessLandscape/3.3/ProblemCharacteristicAnalysis/PermutationPathAnalysis.cs) (1 diff)

branches/1614_GeneralizedQAP/HeuristicLab.Analysis.FitnessLandscape/3.3/ProblemCharacteristicAnalysis/IntegerVectorPathAnalysis.cs

@@ -1 +1 @@
 using System;
 using System.Collections.Generic;
-using HeuristicLab.Encodings.PermutationEncoding;
+using HeuristicLab.Encodings.IntegerVectorEncoding;
 
 namespace HeuristicLab.Analysis.FitnessLandscape {
-  public static class PermutationPathAnalysis {
-    public static CurveAnalysisResult GetCharacteristics(List<List<Tuple<Permutation, double>>> trajectories) {
-      return CurveAnalysis<Permutation>.GetCharacteristics(trajectories, Dist);
+  public static class IntegerVectorPathAnalysis {
+    public static CurveAnalysisResult GetCharacteristics(List<List<Tuple<IntegerVector, double>>> trajectories) {
+      return CurveAnalysis<IntegerVector>.GetCharacteristics(trajectories, Dist);
     }
 
-    private static double Dist(Permutation a, Permutation b) {
+    private static double Dist(IntegerVector a, IntegerVector b) {
       var dist = 0;
       for (var i = 0; i < a.Length; i++)