diff --git a/WhiteRabbit/VectorsConverter.cs b/WhiteRabbit/VectorsConverter.cs index f1087ac..dbeea65 100644 --- a/WhiteRabbit/VectorsConverter.cs +++ b/WhiteRabbit/VectorsConverter.cs @@ -9,7 +9,7 @@ public VectorsConverter(string sourceString) { var rawNumberOfOccurrences = sourceString.GroupBy(ch => ch).ToDictionary(group => group.Key, group => group.Count()); - this.IntToChar = rawNumberOfOccurrences.OrderBy(kvp => kvp.Value).ThenBy(kvp => kvp.Key).Select(kvp => kvp.Key).ToArray(); + this.IntToChar = rawNumberOfOccurrences.OrderBy(kvp => kvp.Key).Select(kvp => kvp.Key).ToArray(); this.CharToInt = Enumerable.Range(0, this.IntToChar.Length).ToDictionary(i => this.IntToChar[i], i => i); } diff --git a/WhiteRabbit/VectorsProcessor.cs b/WhiteRabbit/VectorsProcessor.cs index 00b8b03..6d457d4 100644 --- a/WhiteRabbit/VectorsProcessor.cs +++ b/WhiteRabbit/VectorsProcessor.cs @@ -35,7 +35,6 @@ public IEnumerable[]> GenerateSums(IEnumerable> vectors) { var filteredVectors = FilterVectors(vectors); - var dictionary = ImmutableStack.Create(filteredVectors.ToArray()); var orderedSums = GenerateOrderedSums(this.Target, ImmutableStack.Create>(), dictionary); var allSums = orderedSums.SelectMany(GeneratePermutations); @@ -46,9 +45,7 @@ private IEnumerable> FilterVectors(IEnumerable> vectors) { return vectors - .Where(vector => ((this.Target - vector) & Negative) == Vector.Zero) - //.OrderByDescending(vector => this.GetWeight(vector)) //so that letters that are more rare will come first - .ToList(); + .Where(vector => ((this.Target - vector) & Negative) == Vector.Zero); } [Conditional("DEBUG")]