Merge branch 'scribble' of https://github.com/TrueDoctor/DiscoBot into scribble

1 files changed, 39 insertions, 81 deletions

diff --git a/DiscoBot/Auxiliary/SpellCorrect.cs b/DiscoBot/Auxiliary/SpellCorrect.cs
index 01cce62..c4bd4bf 100644
--- a/DiscoBot/Auxiliary/SpellCorrect.cs
+++ b/DiscoBot/Auxiliary/SpellCorrect.cs
@@ -1,9 +1,8 @@
-namespace DiscoBot.Auxiliary
-{
-    using System;
-    using System.Diagnostics;
-    using System.Linq;
+using System;
+using System.Diagnostics;
 
+namespace DiscoBot.Auxiliary
+{
     public class SpellCorrect : StringComparer
     {
         public const int ErrorThreshold = 94100;
@@ -15,44 +14,25 @@
 
         public static int CompareEasy(string x, string y)
         {
-            if (string.IsNullOrEmpty(x))
-            {
-                throw new ArgumentException("message", nameof(x));
-            }
+            if (string.IsNullOrEmpty(x)) throw new ArgumentException("message", nameof(x));
 
-            if (string.IsNullOrEmpty(y))
-            {
-                throw new ArgumentException("message", nameof(y));
-            }
+            if (string.IsNullOrEmpty(y)) throw new ArgumentException("message", nameof(y));
 
-            if (x.Equals(y))
-            {
-                return 0;
-            }
+            if (x.Equals(y)) return 0;
 
             x = x.ToLower();
             y = y.ToLower();
-            if (x.Equals(y))
-            {
-                return 1;
-            }
+            if (x.Equals(y)) return 1;
 
             var subs = y.Split(' ', '/');
-            int score = subs.Count();
-            foreach (string s in subs)
-            {
+            var score = subs.Length;
+            foreach (var s in subs)
                 if (s.Equals(x))
-                {
                     score--;
-                }
-            }
 
-            if (score < subs.Count())
-            {
-                return score + 1;
-            }
+            if (score < subs.Length) return score + 1;
 
-            return 100000 - (int)(CompareExact(x, y) * 1000.0);
+            return 100000 - (int) (CompareExact(x, y) * 1000.0);
             /*if (y.Contains(x))
                 return 6;*/
         }
@@ -70,78 +50,56 @@
 
         public static double CompareExact(string s, string q)
         {
-
             s = s.ToLower();
             q = q.ToLower();
 
             int i, j;
-            const double Match = 3.0;
-            const double Gap = -2.0;
-            const double Mismatch = -2.0;
+            const double match = 3.0;
+            const double gap = -2.0;
+            const double mismatch = -2.0;
 
             double decay;
 
-            double[,] matrix = new double[s.Length + 1, q.Length + 1];
-            double max = 0.0;
+            var matrix = new double[s.Length + 1, q.Length + 1];
+            var max = 0.0;
             matrix[0, 0] = 0.0;
-            
+
             for (i = 1; i < s.Length; i++)
-            {
-               //  matrix[i, 0] = 0.0;
-                matrix[i, 0] = i * Gap;
-            }
+                //  matrix[i, 0] = 0.0;
+                matrix[i, 0] = i * gap;
 
-            for (i = 1; i < q.Length; i++)
-            {
-               matrix[0, i] = 0.0;
-            }
+            for (i = 1; i < q.Length; i++) matrix[0, i] = 0.0;
 
 
             for (i = 1; i <= s.Length; i++)
+            for (j = 1; j <= q.Length; j++)
             {
-                for (j = 1; j <= q.Length; j++)
-                {
-                    decay = j / (double)(s.Length * 1000);
-                    double add = s[i - 1] == q[j - 1] ? (Match - decay) : Mismatch;
-                    double score = matrix[i - 1, j - 1] + add;
+                decay = j / (double) (s.Length * 1000);
+                var add = s[i - 1] == q[j - 1] ? match - decay : mismatch;
+                var score = matrix[i - 1, j - 1] + add;
 
-                    if (score < (matrix[i - 1, j] + Gap))
-                    {
-                        score = matrix[i - 1, j] + Gap;
-                    }
+                if (score < matrix[i - 1, j] + gap) score = matrix[i - 1, j] + gap;
 
-                    if (score < (matrix[i, j - 1] + Gap))
-                    {
-                        score = matrix[i, j - 1] + Gap;
-                    }
+                if (score < matrix[i, j - 1] + gap) score = matrix[i, j - 1] + gap;
 
-                    if (i > 1 && j > 1)
+                if (i > 1 && j > 1)
+                    if (s[i - 1] == q[j - 2] && s[i - 2] == q[j - 1])
                     {
-                        if (s[i - 1] == q[j - 2] && s[i - 2] == q[j - 1])
-                        {
-                            add = (3 / 2.0) * Match - decay;
-                            if (score < matrix[i - 2, j - 2] + add)
-                            {
-                                score = matrix[i - 2, j - 2] + add;
-                            }
-                        }
+                        add = 3 / 2.0 * match - decay;
+                        if (score < matrix[i - 2, j - 2] + add) score = matrix[i - 2, j - 2] + add;
                     }
-                
-                  //  if (score < 0)
-                  //  {
-                  //      score = 0;
-                  // }
 
-                    if (max < score && i == s.Length)
-                    {
-                        max = score;
-                    }
+                //  if (score < 0)
+                //  {
+                //      score = 0;
+                // }
+
+                if (max < score && i == s.Length) max = score;
 
-                    matrix[i, j] = score;
-                }
+                matrix[i, j] = score;
             }
 
             return max;
         }
     }
-}
+}
\ No newline at end of file