Changeset 15718 for branches/1614_GeneralizedQAP/HeuristicLab.Analysis.FitnessLandscape/3.3

Timestamp:

02/04/18 21:06:14 (7 years ago)

Author:

abeham

Message:

#1614:

• Scale directed walk fitness values
• Performance improvements to RLD view
• Changed CPLEX to use a single thread only
• Set the context to null when algorithm is stopped

Location:

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

Files:

• DoubleMatrixCharacteristicCalculator.cs (modified) (2 diffs)
• GQAP/GQAPCharacteristicCalculator.cs (modified) (1 diff)
• GQAP/GQAPDirectedWalk.cs (modified) (1 diff)

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

@@ -20 +20 @@
 #endregion
 
+using System;
+using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Data;
-using System;
-using System.Linq;
 
 namespace HeuristicLab.Analysis.FitnessLandscape {
@@ -30 +30 @@
       var avg = m.Average();
       var stdDev = m.StandardDeviation();
+      return stdDev / avg;
+    }
+
+    public static double CoeffVariationNonZeroes(DoubleMatrix m) {
+      var nonzeroes = m.Where(x => !x.IsAlmost(0));
+      var avg = nonzeroes.Average();
+      var stdDev = nonzeroes.StandardDeviation();
       return stdDev / avg;
     }

branches/1614_GeneralizedQAP/HeuristicLab.Analysis.FitnessLandscape/3.3/ProblemCharacteristicAnalysis/GQAP/GQAPCharacteristicCalculator.cs

@@ -66 +66 @@
           yield return new Result(chara, new DoubleValue(inst.Capacities.Length / (double)inst.Demands.Length));
         if (chara == "FlowDominance")
-          yield return new Result(chara, new DoubleValue(DoubleMatrixCharacteristicCalculator.CoeffVariation(inst.Weights)));
+          yield return new Result(chara, new DoubleValue(DoubleMatrixCharacteristicCalculator.CoeffVariationNonZeroes(inst.Weights)));
         if (chara == "DistanceDominance")
-          yield return new Result(chara, new DoubleValue(DoubleMatrixCharacteristicCalculator.CoeffVariation(inst.Distances)));
+          yield return new Result(chara, new DoubleValue(DoubleMatrixCharacteristicCalculator.CoeffVariationNonZeroes(inst.Distances)));
         if (chara == "FlowSparsity")
           yield return new Result(chara, new DoubleValue(DoubleMatrixCharacteristicCalculator.Sparsity(inst.Weights)));

branches/1614_GeneralizedQAP/HeuristicLab.Analysis.FitnessLandscape/3.3/ProblemCharacteristicAnalysis/GQAP/GQAPDirectedWalk.cs

@@ -134 +134 @@
     public static IEnumerable<List<Tuple<IntegerVector, double>>> Run(IRandom random, GQAP gqap, IEnumerable<IntegerVector> points, bool bestImprovement = true) {
       var iter = points.GetEnumerator();
-      if (!iter.MoveNext()) yield break;
+      if (!iter.MoveNext()) return new List<Tuple<IntegerVector, double>>[0];
 
       var start = iter.Current;
+      var walks = new List<List<Tuple<IntegerVector, double>>>();
       while (iter.MoveNext()) {
         var end = iter.Current;
 
         var walk = (bestImprovement ? BestDirectedWalk(gqap, start, end) : FirstDirectedWalk(random, gqap, start, end)).ToList();
-        yield return walk.ToList();
+        walks.Add(walk);
         start = end;
       } // end paths
+
+      var min = walks.SelectMany(x => x.Select(y => y.Item2)).Min();
+      var max = walks.SelectMany(x => x.Select(y => y.Item2)).Max();
+
+      if (min == max) max = min + 1;
+      return walks.Select(w => w.Select(x => Tuple.Create(x.Item1, (x.Item2 - min) / (max - min))).ToList());
     }