Add cache lambdas and fix ScorerCache

FuzzySharp/Extractor/ExtractedResult.cs

@@ -1,19 +1,15 @@
 using System;
-using System.Collections.Generic;
 
 namespace FuzzySharp.Extractor
 {
-    public class ExtractedResult<T> : IComparable<ExtractedResult<T>> 
+    public struct ExtractedResult<T> : IComparable<ExtractedResult<T>>
     {
+        public T Value { get; }
+        public int Score { get; }
+        public int Index { get; }
 
-        public readonly T Value;
-        public readonly int Score;
-        public readonly int Index;
-
-        public ExtractedResult(T value, int score)
+        public ExtractedResult(T value, int score) : this(value, score, 0)
         {
-            Value = value;
-            Score = score;
         }
 
         public ExtractedResult(T value, int score, int index)
@@ -25,7 +21,7 @@ public ExtractedResult(T value, int score, int index)
 
         public int CompareTo(ExtractedResult<T> other)
         {
-            return Comparer<int>.Default.Compare(this.Score, other.Score);
+            return Score.CompareTo(other.Score);
         }
 
         public override string ToString()

FuzzySharp/PreProcess/StringPreprocessorFactory.cs

@@ -5,11 +5,14 @@ namespace FuzzySharp.PreProcess
 {
     internal class StringPreprocessorFactory
     {
-        private static string pattern = "[^ a-zA-Z0-9]";
+        private static readonly Regex FullMatchRegex = new Regex("[^ a-zA-Z0-9]", RegexOptions.Compiled);
+
+        private static readonly Func<string, string> CacheDefault = Default;
+        private static readonly Func<string, string> Ident = x => x;
 
         private static string Default(string input)
         {
-            input = Regex.Replace(input, pattern, " ");
+            input = FullMatchRegex.Replace(input, " ");;
             input = input.ToLower();
 
             return input.Trim();
@@ -20,9 +23,9 @@ public static Func<string, string> GetPreprocessor(PreprocessMode mode)
             switch (mode)
             {
                 case PreprocessMode.Full:
-                    return Default;
+                    return CacheDefault;
                 case PreprocessMode.None:
-                    return s => s;
+                    return Ident;
                 default:
                     throw new InvalidOperationException($"Invalid string preprocessor mode: {mode}");
             }

FuzzySharp/SimilarityRatio/Scorer/StrategySensitive/Simple/DefaultRatioScorer.cs

@@ -5,6 +5,6 @@ namespace FuzzySharp.SimilarityRatio.Scorer.StrategySensitive
 {
     public class DefaultRatioScorer : SimpleRatioScorerBase
     {
-        protected override Func<string, string, int> Scorer => DefaultRatioStrategy.Calculate;
+        protected override Func<string, string, int> Scorer => DefaultRatioStrategy.CacheCalculate;
     }
 }

FuzzySharp/SimilarityRatio/Scorer/StrategySensitive/Simple/PartialRatioScorer.cs

@@ -5,6 +5,6 @@ namespace FuzzySharp.SimilarityRatio.Scorer.StrategySensitive
 {
     public class PartialRatioScorer : SimpleRatioScorerBase
     {
-        protected override Func<string, string, int> Scorer => PartialRatioStrategy.Calculate;
+        protected override Func<string, string, int> Scorer => PartialRatioStrategy.CacheCalculate;
     }
 }

FuzzySharp/SimilarityRatio/Scorer/StrategySensitive/TokenAbbreviation/PartialTokenAbbreviationScorer.cs

@@ -5,6 +5,6 @@ namespace FuzzySharp.SimilarityRatio.Scorer.StrategySensitive
 {
     public class PartialTokenAbbreviationScorer : TokenAbbreviationScorerBase
     {
-        protected override Func<string, string, int> Scorer => PartialRatioStrategy.Calculate;
+        protected override Func<string, string, int> Scorer => PartialRatioStrategy.CacheCalculate;
     }
 }

FuzzySharp/SimilarityRatio/Scorer/StrategySensitive/TokenAbbreviation/TokenAbbreviationScorer.cs

@@ -5,6 +5,6 @@ namespace FuzzySharp.SimilarityRatio.Scorer.StrategySensitive
 {
     public class TokenAbbreviationScorer : TokenAbbreviationScorerBase
     {
-        protected override Func<string, string, int> Scorer => DefaultRatioStrategy.Calculate;
+        protected override Func<string, string, int> Scorer => DefaultRatioStrategy.CacheCalculate;
     }
 }

FuzzySharp/SimilarityRatio/Scorer/StrategySensitive/TokenDifference/PartialTokenDifferenceScorer.cs

@@ -5,6 +5,6 @@ namespace FuzzySharp.SimilarityRatio.Scorer.StrategySensitive
 {
     public class PartialTokenDifferenceScorer : TokenDifferenceScorerBase
     {
-        protected override Func<string[], string[], int> Scorer => PartialRatioStrategy<string>.Calculate;
+        protected override Func<string[], string[], int> Scorer => PartialRatioStrategy<string>.CacheCalculate;
     }
 }

FuzzySharp/SimilarityRatio/Scorer/StrategySensitive/TokenDifference/TokenDifferenceScorer.cs

@@ -5,6 +5,6 @@ namespace FuzzySharp.SimilarityRatio.Scorer.StrategySensitive
 {
     public class TokenDifferenceScorer : TokenDifferenceScorerBase
     {
-        protected override Func<string[], string[], int> Scorer => DefaultRatioStrategy<string>.Calculate;
+        protected override Func<string[], string[], int> Scorer => DefaultRatioStrategy<string>.CacheCalculate;
     }
 }

FuzzySharp/SimilarityRatio/Scorer/StrategySensitive/TokenInitialism/PartialTokenInitialismScorer.cs

@@ -5,6 +5,6 @@ namespace FuzzySharp.SimilarityRatio.Scorer.StrategySensitive
 {
     public class PartialTokenInitialismScorer : TokenInitialismScorerBase
     {
-        protected override Func<string, string, int> Scorer => PartialRatioStrategy.Calculate;
+        protected override Func<string, string, int> Scorer => PartialRatioStrategy.CacheCalculate;
     }
 }

FuzzySharp/SimilarityRatio/Scorer/StrategySensitive/TokenInitialism/TokenInitialismScorer.cs

@@ -5,6 +5,6 @@ namespace FuzzySharp.SimilarityRatio.Scorer.StrategySensitive
 {
     public class TokenInitialismScorer : TokenInitialismScorerBase
     {
-        protected override Func<string, string, int> Scorer => DefaultRatioStrategy.Calculate;
+        protected override Func<string, string, int> Scorer => DefaultRatioStrategy.CacheCalculate;
     }
 }

FuzzySharp/SimilarityRatio/Scorer/StrategySensitive/TokenSet/PartialTokenSetScorer.cs

@@ -5,6 +5,6 @@ namespace FuzzySharp.SimilarityRatio.Scorer.StrategySensitive
 {
     public class PartialTokenSetScorer : TokenSetScorerBase
     {
-        protected override Func<string, string, int> Scorer => PartialRatioStrategy.Calculate;
+        protected override Func<string, string, int> Scorer => PartialRatioStrategy.CacheCalculate;
     }
 }

FuzzySharp/SimilarityRatio/Scorer/StrategySensitive/TokenSet/TokenSetScorer.cs

@@ -5,6 +5,6 @@ namespace FuzzySharp.SimilarityRatio.Scorer.StrategySensitive
 {
     public class TokenSetScorer : TokenSetScorerBase
     {
-        protected override Func<string, string, int> Scorer => DefaultRatioStrategy.Calculate;
+        protected override Func<string, string, int> Scorer => DefaultRatioStrategy.CacheCalculate;
     }
 }

FuzzySharp/SimilarityRatio/Scorer/StrategySensitive/TokenSort/PartialTokenSortScorer.cs

@@ -5,6 +5,6 @@ namespace FuzzySharp.SimilarityRatio.Scorer.StrategySensitive
 {
     public class PartialTokenSortScorer : TokenSortScorerBase
     {
-        protected override Func<string, string, int> Scorer => PartialRatioStrategy.Calculate;
+        protected override Func<string, string, int> Scorer => PartialRatioStrategy.CacheCalculate;
     }
 }

FuzzySharp/SimilarityRatio/Scorer/StrategySensitive/TokenSort/TokenSortAlgorithm.cs

@@ -6,10 +6,12 @@ namespace FuzzySharp.SimilarityRatio.Scorer.StrategySensitive
 {
     public abstract class TokenSortScorerBase : StrategySensitiveScorerBase
     {
+        private static readonly Regex SpaceRegex = new Regex(@"\s+", RegexOptions.Compiled); 
+
         public override int Score(string input1, string input2)
         {
-            var sorted1 = String.Join(" ", Regex.Split(input1, @"\s+").Where(s => s.Any()).OrderBy(s => s)).Trim();
-            var sorted2 = String.Join(" ", Regex.Split(input2, @"\s+").Where(s => s.Any()).OrderBy(s => s)).Trim();
+            var sorted1 = String.Join(" ", SpaceRegex.Split(input1).Where(s => s.Any()).OrderBy(s => s)).Trim();
+            var sorted2 = String.Join(" ", SpaceRegex.Split(input2).Where(s => s.Any()).OrderBy(s => s)).Trim();
 
             return Scorer(sorted1, sorted2);
         }

FuzzySharp/SimilarityRatio/Scorer/StrategySensitive/TokenSort/TokenSortScorer.cs

@@ -5,6 +5,6 @@ namespace FuzzySharp.SimilarityRatio.Scorer.StrategySensitive
 {
     public class TokenSortScorer : TokenSortScorerBase
     {
-        protected override Func<string, string, int> Scorer => DefaultRatioStrategy.Calculate;
+        protected override Func<string, string, int> Scorer => DefaultRatioStrategy.CacheCalculate;
     }
 }

FuzzySharp/SimilarityRatio/ScorerCache.cs

@@ -1,15 +1,19 @@
 using System;
 using System.Collections.Concurrent;
+using System.Runtime.CompilerServices;
 using FuzzySharp.SimilarityRatio.Scorer;
 
 namespace FuzzySharp.SimilarityRatio
 {
     public static class ScorerCache
     {
-        private static readonly ConcurrentDictionary<Type, IRatioScorer> s_scorerCache = new ConcurrentDictionary<Type, IRatioScorer>();
-        public static IRatioScorer Get<T>() where T : IRatioScorer, new()
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static IRatioScorer Get<T>() where T : IRatioScorer, new() => GenericCache<T>.Instance;
+
+        private static class GenericCache<T> 
+            where T : IRatioScorer, new()
         {
-            return s_scorerCache.GetOrAdd(typeof(T), new T());
+            public static readonly T Instance = new T();
         }
     }
 }

FuzzySharp/SimilarityRatio/Strategy/DefaultRatioStrategy.cs

@@ -4,6 +4,8 @@ namespace FuzzySharp.SimilarityRatio.Strategy
 {
     internal class DefaultRatioStrategy
     {
+        public static readonly Func<string, string, int> CacheCalculate = Calculate;
+
         public static int Calculate(string input1, string input2)
         {
             if (input1.Length == 0 || input2.Length == 0)

FuzzySharp/SimilarityRatio/Strategy/Generic/DefaultRatioStrategyT.cs

@@ -4,6 +4,8 @@ namespace FuzzySharp.SimilarityRatio.Strategy.Generic
 {
     internal class DefaultRatioStrategy<T> where T : IEquatable<T>
     {
+        public static readonly Func<T[], T[], int> CacheCalculate = Calculate;
+
         public static int Calculate(T[] input1, T[] input2)
         {
             if (input1.Length == 0 || input2.Length == 0)

FuzzySharp/SimilarityRatio/Strategy/Generic/PartialRatioStrategyT.cs

@@ -7,6 +7,8 @@ namespace FuzzySharp.SimilarityRatio.Strategy.Generic
 {
     internal class PartialRatioStrategy<T> where T : IEquatable<T>
     {
+        public static readonly Func<T[], T[], int> CacheCalculate = Calculate;
+
         public static int Calculate(T[] input1, T[] input2)
         {
             T[] shorter;

FuzzySharp/SimilarityRatio/Strategy/PartialRatioStrategy.cs

@@ -7,6 +7,8 @@ namespace FuzzySharp.SimilarityRatio.Strategy
 {
     internal class PartialRatioStrategy
     {
+        public static readonly Func<string, string, int> CacheCalculate = Calculate;
+
         public static int Calculate(string input1, string input2)
         {
             string shorter;