Changeset 6981

Timestamp:

11/10/11 09:27:28 (13 years ago)

Author:

mkommend

Message:

#1647: Sorted variable frequencies by the variable name and added NaturalStringComparer.

Location:

trunk/sources

Files:

• HeuristicLab.Common/3.3/HeuristicLab.Common-3.3.csproj (modified) (1 diff)
• HeuristicLab.Common/3.3/NaturalStringComparer.cs (added)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Analyzers/SymbolicDataAnalysisVariableFrequencyAnalyzer.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Common/3.3/HeuristicLab.Common-3.3.csproj

@@ -124 +124 @@
     <Compile Include="Content\IStorableContent.cs" />
     <Compile Include="Constants.cs" />
+    <Compile Include="NaturalStringComparer.cs" />
     <Compile Include="ObjectExtensions.cs" />
     <Compile Include="DeepCloneable.cs" />

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Analyzers/SymbolicDataAnalysisVariableFrequencyAnalyzer.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Linq;
+using HeuristicLab.Analysis;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
-using HeuristicLab.Operators;
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.Analysis;
 
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
@@ -139 +138 @@
       double totalNumberOfSymbols = variableFrequencies.Values.Sum();
 
-      foreach (var pair in variableFrequencies)
+      foreach (var pair in variableFrequencies.OrderBy(p => p.Key, new NaturalStringComparer()))
         yield return new KeyValuePair<string, double>(pair.Key, pair.Value / totalNumberOfSymbols);
     }