Changeset 9142

Timestamp:

01/10/13 09:48:22 (12 years ago)

Author:

epitzer

Message:

#1696 enable information analysis on very short walks

Location:

branches/FitnessLandscapeAnalysis/HeuristicLab.Analysis.FitnessLandscape/Analysis

Files:

• InformationAnalysis.cs (modified) (1 diff)
• InformationAnalyzer.cs (modified) (2 diffs)

branches/FitnessLandscapeAnalysis/HeuristicLab.Analysis.FitnessLandscape/Analysis/InformationAnalysis.cs

@@ -46 +46 @@
       Regularity = new HashSet<double>(differences).Count;
       Diversity = new HashSet<double>(qualities).Count;
+      var absDifferences = differences.Select(Math.Abs).OrderBy(d => d).ToList();
+      nQuantiles = Math.Min(nQuantiles, absDifferences.Count);
       var thresholds = (nQuantiles == 0
-                         ? differences.Select(Math.Abs).OrderBy(d => d)
+                         ? absDifferences
                          : UniqueThresholdCalculator.DetermineThresholds(differences, nQuantiles)).ToList();
       foreach (var eps in thresholds) {

branches/FitnessLandscapeAnalysis/HeuristicLab.Analysis.FitnessLandscape/Analysis/InformationAnalyzer.cs

@@ -19 +19 @@
  */
 #endregion
+
+using System;
 using System.Linq;
 using HeuristicLab.Analysis.FitnessLandscape.DataTables;
@@ -178 +180 @@
       int shapeSize = ShapeSizeParameter.ActualValue.Value;
       var qualities = QualityTrailParameter.ActualValue.Rows.First().Values.ToList();
-      if (qualities.Count > nQuantiles) {
+      if (qualities.Count > 2) {
         InformationAnalysisTable informationTable = InformationParameter.ActualValue;
         var informationContent = informationTable.Rows["Information Content"].Values;