Changeset 7223 for trunk/sources

Timestamp:

12/21/11 17:01:58 (12 years ago)

Author:

bburlacu

Message:

#1661: Fixed bug in the CalculateHistogram method inside the DataTableView, adjusted the way vertical scaling is performed in the SymbolicExpressionTreeLengthAnalyzer.

Location:

trunk/sources

Files:

• HeuristicLab.Analysis.Views/3.3/DataTableView.cs (modified) (2 diffs)
• HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Analyzers/SymbolicExpressionTreeLengthAnalyzer.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Analysis.Views/3.3/DataTableView.cs

@@ -223 +223 @@
       if (Content.VisualProperties.TitleFont != null) chart.Titles[0].Font = Content.VisualProperties.TitleFont;
       if (!Content.VisualProperties.TitleColor.IsEmpty) chart.Titles[0].ForeColor = Content.VisualProperties.TitleColor;
-      chart.Titles[0].Text = Content.VisualProperties.Title;
 
       if (Content.VisualProperties.AxisTitleFont != null) area.AxisX.TitleFont = Content.VisualProperties.AxisTitleFont;
@@ -578 +577 @@
       }
 
+      double intervalCenter = intervalWidth / 2;
+
+      double min = 0.0;
+      if (!Double.IsNaN(Content.VisualProperties.XAxisMinimumFixedValue) && !Content.VisualProperties.XAxisMinimumAuto)
+        min = Content.VisualProperties.XAxisMinimumFixedValue;
+      else min = minValue;
+
+      double axisInterval = intervalWidth / row.VisualProperties.ScaleFactor;
+
       var area = chart.ChartAreas[0];
-      double current = 0.0;
-      if (!Double.IsNaN(Content.VisualProperties.XAxisMinimumFixedValue) && !Content.VisualProperties.XAxisMinimumAuto)
-        current = Content.VisualProperties.XAxisMinimumFixedValue;
-      else current = minValue;
-
-      area.AxisX.Interval = intervalWidth / row.VisualProperties.ScaleFactor;
-      area.AxisX.IntervalOffset = intervalWidth / row.VisualProperties.ScaleFactor;
-
-      series.SetCustomProperty("PointWidth", intervalWidth.ToString());
-
-      int frequency = 0;
-      foreach (double v in row.Values.Where(x => !IsInvalidValue(x)).OrderBy(x => x)) {
-        while (v > current + intervalWidth) {
-          series.Points.AddXY(current + intervalWidth, frequency);
-          current += intervalWidth;
-          frequency = 0;
-        }
-        frequency++;
-      }
-      series.Points.AddXY(current + intervalWidth, frequency);
+      area.AxisX.Interval = axisInterval;
+
+      series.SetCustomProperty("PointWidth", "1"); // 0.8 is the default value
+
+      // get the range or intervals which define the grouping of the frequency values
+      var doubleRange = DoubleRange(min, maxValue + intervalWidth, intervalWidth).Skip(1).ToList();
+
+      // aggregate the row values by unique key and frequency value
+      var valueFrequencies = (from v in row.Values
+                              where !IsInvalidValue(v)
+                              orderby v
+                              group v by v into g
+                              select new Tuple<double, double>(g.First(), g.Count())).ToList();
+
+      // shift the chart to the left so the bars are placed on the intervals
+      if (valueFrequencies.First().Item1 < doubleRange.First())
+        series.Points.Add(new DataPoint(min - intervalWidth, 0));
+
+      // add data points
+      int j = 0;
+      foreach (var d in doubleRange) {
+        double sum = 0.0;
+        // sum the frequency values that fall within the same interval
+        while (j < valueFrequencies.Count && valueFrequencies[j].Item1 < d) {
+          sum += valueFrequencies[j].Item2;
+          ++j;
+        }
+        series.Points.Add(new DataPoint(d - intervalCenter, sum) { ToolTip = "X: [" + (d - intervalWidth) + "-" + d + "), Y: " + sum });
+      }
     }
 
     #region Helpers
+    public static IEnumerable<double> DoubleRange(double min, double max, double step) {
+      double i;
+      for (i = min; i <= max; i += step)
+        yield return i;
+
+      if (i != max + step)
+        yield return i;
+    }
+
     protected void RemoveCustomPropertyIfExists(Series series, string property) {
       if (series.IsCustomPropertySet(property)) series.DeleteCustomProperty(property);

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Analyzers/SymbolicExpressionTreeLengthAnalyzer.cs

@@ -29 +29 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using System;
 
 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
@@ -201 +202 @@
         treeLengthsTable.VisualProperties.YAxisMaximumAuto = false;
         treeLengthsTable.VisualProperties.YAxisMinimumFixedValue = 0.0;
-        int maxFreq = solutions.GroupBy(s => s.Length).Max(g => g.Count());
+        int maxFreq = (int)Math.Round(solutions.GroupBy(s => s.Length).Max(g => g.Count()) / treeLengthsTableRow.VisualProperties.ScaleFactor);
         if (maxFreq % 5 != 0)
           maxFreq += (5 - maxFreq % 5);