Changeset 3802

Timestamp:

05/13/10 20:29:01 (14 years ago)

Author:

gkronber

Message:

Minor efficiency improvements for variable frequency analyzer. #938

File:

• trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/VariableFrequencyAnalyser.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/Symbolic/VariableFrequencyAnalyser.cs

@@ -87 +87 @@
       int totalVariableReferences = 0;
       Dictionary<string, double> variableReferencesSum = new Dictionary<string, double>();
+      Dictionary<string, double> variableFrequencies = new Dictionary<string, double>();
       foreach (var inputVariable in inputVariables)
         variableReferencesSum[inputVariable] = 0.0;
@@ -98 +99 @@
       foreach (string inputVariable in inputVariables) {
         double relFreq = variableReferencesSum[inputVariable] / (double)totalVariableReferences;
-        yield return new KeyValuePair<string, double>(inputVariable, relFreq);
+        variableFrequencies.Add(inputVariable, relFreq);
       }
+      return variableFrequencies;
     }
 
@@ -107 +109 @@
 
     private static IEnumerable<KeyValuePair<string, int>> GetVariableReferenceCount(SymbolicExpressionTree tree, IEnumerable<string> inputVariables) {
+      Dictionary<string, int> references = new Dictionary<string, int>();
       var groupedFuns = (from node in tree.IterateNodesPrefix().OfType<VariableTreeNode>()
-                         select node.VariableName).GroupBy(x => x);
+                         select node.VariableName)
+                         .GroupBy(x => x)
+                         .Select(g => new { Key = g.Key, Count = g.Count() })
+                         .ToArray();
 
       foreach (var inputVariable in inputVariables) {
         var matchingFuns = from g in groupedFuns
                            where g.Key == inputVariable
-                           select g.Count();
-        if (matchingFuns.Count() == 0) yield return new KeyValuePair<string, int>(inputVariable, 0);
+                           select g.Count;
+        if (matchingFuns.Count() == 0)
+          references.Add(inputVariable, 0);
         else {
-          yield return new KeyValuePair<string, int>(inputVariable, matchingFuns.Single());
+          references.Add(inputVariable, matchingFuns.Single());
         }
       }
+      return references;
     }
   }