Changeset 14678 for branches/PerformanceComparison/HeuristicLab.Analysis.FitnessLandscape/3.3/ProblemCharacteristicAnalysis

Timestamp:

02/17/17 12:51:44 (8 years ago)

Author:

abeham

Message:

#2457: worked on problem instance detection

Location:

branches/PerformanceComparison/HeuristicLab.Analysis.FitnessLandscape/3.3/ProblemCharacteristicAnalysis

Files:

• . (moved) (moved from branches/PerformanceComparison/HeuristicLab.OptimizationExpertSystem.Common/3.3/ProblemCharacteristicAnalysis)
• CharacteristicCalculator.cs (modified) (1 diff)
• DoubleMatrixCharacteristicCalculator.cs (modified) (1 diff)
• QAP/QAPCharacteristicCalculator.cs (modified) (1 diff)
• QAP/QAPDirectedWalk.cs (modified) (3 diffs)

branches/PerformanceComparison/HeuristicLab.Analysis.FitnessLandscape/3.3/ProblemCharacteristicAnalysis/CharacteristicCalculator.cs

@@ -27 +27 @@
 using System.Collections.Generic;
 
-namespace HeuristicLab.Problems.CharacteristicAnalysis {
+namespace HeuristicLab.Analysis.FitnessLandscape {
   [Item("Characteristic Calculator", "")]
   [StorableClass]

branches/PerformanceComparison/HeuristicLab.Analysis.FitnessLandscape/3.3/ProblemCharacteristicAnalysis/DoubleMatrixCharacteristicCalculator.cs

@@ -25 +25 @@
 using System.Linq;
 
-namespace HeuristicLab.Problems.CharacteristicAnalysis {
+namespace HeuristicLab.Analysis.FitnessLandscape {
   public static class DoubleMatrixCharacteristicCalculator {
     public static double CoeffVariation(DoubleMatrix m) {

branches/PerformanceComparison/HeuristicLab.Analysis.FitnessLandscape/3.3/ProblemCharacteristicAnalysis/QAP/QAPCharacteristicCalculator.cs

@@ -30 +30 @@
 using System.Linq;
 
-namespace HeuristicLab.Problems.CharacteristicAnalysis.QAP {
+namespace HeuristicLab.Analysis.FitnessLandscape {
   [Item("QAP Characteristic Calculator", "")]
   [StorableClass]

branches/PerformanceComparison/HeuristicLab.Analysis.FitnessLandscape/3.3/ProblemCharacteristicAnalysis/QAP/QAPDirectedWalk.cs

@@ -33 +33 @@
 using System.Linq;
 
-namespace HeuristicLab.Problems.CharacteristicAnalysis.QAP {
+namespace HeuristicLab.Analysis.FitnessLandscape {
   [Item("Directed Walk (QAP-specific)", "")]
   [StorableClass]
@@ -110 +110 @@
     }
 
+    public static IEnumerable<IResult> Calculate(List<List<Tuple<Permutation, double>>> trajectories) {
+      var firstDerivatives = trajectories.Select(path => ApproximateDerivative(path).ToList()).ToList();
+      var secondDerivatives = firstDerivatives.Select(d1 => ApproximateDerivative(d1).ToList()).ToList();
+
+      var props = GetCharacteristics(trajectories, firstDerivatives, secondDerivatives).ToDictionary(x => x.Item1, x => x.Item2);
+      yield return new Result("Swap2.Sharpness", new DoubleValue(props["Sharpness"]));
+      yield return new Result("Swap2.Bumpiness", new DoubleValue(props["Bumpiness"]));
+      yield return new Result("Swap2.Flatness", new DoubleValue(props["Flatness"]));
+      yield return new Result("Swap2.Steadiness", new DoubleValue(props["Steadiness"]));
+    }
+
     public static IEnumerable<List<Tuple<Permutation, double>>> Run(IRandom random, QuadraticAssignmentProblem qap, IEnumerable<Permutation> permutations, bool bestImprovement = true) {
       var iter = permutations.GetEnumerator();
       if (!iter.MoveNext()) yield break;
 
+      var min = qap.LowerBound.Value;
+      var max = qap.AverageQuality.Value;
+
       var start = iter.Current;
       while (iter.MoveNext()) {
@@ -119 +133 @@
 
         var walk = (bestImprovement ? BestDirectedWalk(qap, start, end) : FirstDirectedWalk(random, qap, start, end)).ToList();
-        var max = walk.Max(x => x.Item2);
-        var min = walk.Min(x => x.Item2);
-        if (max > min)
-          yield return walk.Select(x => Tuple.Create(x.Item1, (x.Item2 - min) / (max - min))).ToList();
-        else yield return walk.Select(x => Tuple.Create(x.Item1, 0.0)).ToList();
+        yield return walk.Select(x => Tuple.Create(x.Item1, (x.Item2 - min) / (max - min))).ToList();
         start = end;
       } // end paths
     }
 
-    private IEnumerable<Tuple<string, double>> GetCharacteristics(List<List<Tuple<Permutation, double>>> f, List<List<Tuple<Permutation, double>>> f1, List<List<Tuple<Permutation, double>>> f2) {
+    private static IEnumerable<Tuple<string, double>> GetCharacteristics(List<List<Tuple<Permutation, double>>> f, List<List<Tuple<Permutation, double>>> f1, List<List<Tuple<Permutation, double>>> f2) {
       var sharpness = f2.Average(x => Area(x));
       var bumpiness = 0.0;