Changeset 14691 for branches/PerformanceComparison/HeuristicLab.Analysis.FitnessLandscape/3.3/ProblemInstanceAnalysis

Timestamp:

02/23/17 10:42:58 (8 years ago)

Author:

abeham

Message:

#2457: working on identification of problem instances

Location:

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

Files:

• ProblemInstanceAnalyzer.cs (modified) (1 diff)
• QAPPRProblemInstanceAnalyzer.cs (modified) (1 diff)

branches/PerformanceComparison/HeuristicLab.Analysis.FitnessLandscape/3.3/ProblemInstanceAnalysis/ProblemInstanceAnalyzer.cs

@@ -78 +78 @@
       if (currentCharacteristics == null) return base.Apply();
 
-      var order = Enumerable.Range(0, kbCharacteristics.Rows)
+      var means = kbCharacteristics.GetRow(kbCharacteristics.Rows - 2).ToArray();
+      var stdevs = kbCharacteristics.GetRow(kbCharacteristics.Rows - 1).ToArray();
+
+      for (var i = 0; i < means.Length; i++) {
+        currentCharacteristics[i] = (currentCharacteristics[i] - means[i]) / stdevs[i];
+      }
+
+      var order = Enumerable.Range(0, kbCharacteristics.Rows - 2)
         .Select(row => new { Row = row, MSE = kbCharacteristics.GetRow(row).Zip(currentCharacteristics, (a, b) => (a - b) * (a - b)).Average() })
         .OrderBy(x => x.MSE);
 
       var instances = kbCharacteristics.RowNames.ToList();
-      while (instances.Count < kbCharacteristics.Rows)
+      while (instances.Count < kbCharacteristics.Rows - 2)
         instances.Add(instances.Count.ToString(CultureInfo.CurrentCulture.NumberFormat));
 

branches/PerformanceComparison/HeuristicLab.Analysis.FitnessLandscape/3.3/ProblemInstanceAnalysis/QAPPRProblemInstanceAnalyzer.cs

@@ -49 +49 @@
       if (trajectories.Count == 0) return null;
 
-      var characteristics = QAPDirectedWalk.Calculate(trajectories).Select(x => x.Value).ToList();
-      var result = new DoubleArray(characteristics.Count);
-      for (var i = 0; i < characteristics.Count; i++) {
-        var dv = characteristics[i] as DoubleValue;
-        if (dv != null) result[i] = dv.Value;
-        else {
-          var iv = characteristics[i] as IntValue;
-          if (iv != null) result[i] = iv.Value;
-        }
-      }
-      return result;
+      return new DoubleArray(PermutationPathAnalysis.GetCharacteristics(trajectories).GetValues().ToArray());
     }
   }