Changeset 5392

Timestamp:

01/28/11 13:10:29 (14 years ago)

Author:

gkronber

Message:

#1398 fixed a bug in SymbolicExpressionSymbolFrequencyAnalyzer.

File:

• trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/Analyzers/SymbolicExpressionSymbolFrequencyAnalyzer.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/Analyzers/SymbolicExpressionSymbolFrequencyAnalyzer.cs

@@ -83 +83 @@
       }
 
+      // all rows must have the same number of values so we can just take the first
+      int numberOfValues = SymbolFrequencies.Rows.Select(r => r.Values.Count).DefaultIfEmpty().First();
+
       foreach (var pair in SymbolicExpressionSymbolFrequencyAnalyzer.CalculateSymbolFrequencies(expressions)) {
-        if (SymbolFrequencies.Rows.ContainsKey(pair.Key))
-          SymbolFrequencies.Rows[pair.Key].Values.Add(pair.Value);
-        else {
-          int missingValues = SymbolFrequencies.Rows.Select(r => r.Values.Count()-1).DefaultIfEmpty().Max();
-          List<double> values = new List<double>(Enumerable.Repeat(0.0, missingValues));
-          values.Add(pair.Value);
-          DataRow row = new DataRow(pair.Key, "", values);
+        if (!SymbolFrequencies.Rows.ContainsKey(pair.Key)) {
+          // initialize a new row for the symbol and pad with zeros
+          DataRow row = new DataRow(pair.Key, "", Enumerable.Repeat(0.0, numberOfValues));
           row.VisualProperties.StartIndexZero = true;
           SymbolFrequencies.Rows.Add(row);
         }
+        SymbolFrequencies.Rows[pair.Key].Values.Add(pair.Value);
       }
 
-      int maxValues = SymbolFrequencies.Rows.Select(r => r.Values.Count).DefaultIfEmpty().Max();
-      foreach (var row in SymbolFrequencies.Rows.Where(r => r.Values.Count != maxValues))
+      // add a zero for each data row that was not modified in the previous loop 
+      foreach (var row in SymbolFrequencies.Rows.Where(r => r.Values.Count != numberOfValues + 1))
         row.Values.Add(0.0);
 
@@ -115 +115 @@
       }
 
-      foreach (string symbolName in symbolFrequencies.Keys.ToList())
-        symbolFrequencies[symbolName] /= totalNumberOfSymbols;
-      return symbolFrequencies;
+      foreach (var pair in symbolFrequencies)
+        yield return new KeyValuePair<string, double>(pair.Key, pair.Value / totalNumberOfSymbols);
     }
   }