fix: Magic number

the-flx · Sep 23, 2023 · 1c70713 · 1c70713
1 parent 4f85f87
commit 1c70713
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 21 deletions.
diff --git a/Compile/Compile.Test/UnitTest1.cs b/Compile/Compile.Test/UnitTest1.cs
@@ -23,8 +23,13 @@ public void TestCapital()
         public void TestScore()
         {
             Score score = Flx.Score("switch-to-buffer", "stb");
-
             Assert.AreEqual(237, score.score);
+
+            score = Flx.Score("TestSomeFunctionExterme", "met");
+            Assert.AreEqual(57, score.score);
+
+            score = Flx.Score("MetaX_Version", "met");
+            Assert.AreEqual(211, score.score);
         }
     }
 }
diff --git a/Compile/Compile/Compile.csproj b/Compile/Compile/Compile.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>$(VersionPrefix)0.1.1</Version>
+    <Version>$(VersionPrefix)0.1.2</Version>
     <Description>Rewrite emacs-flx in C#</Description>
     <Copyright>FlxCs is distributed under the terms of the MIT license.</Copyright>
     <PackageProjectUrl>https://github.com/jcs090218/FlxCs</PackageProjectUrl>

diff --git a/Source/Assets/FlxCs/Scripts/Flx.cs b/Source/Assets/FlxCs/Scripts/Flx.cs
@@ -343,7 +343,7 @@ public static void FindBestMatch(List<Score> imatch,
                             if ((caar - 1) == index)
                             {
                                 tempScore = cadr + heatmap[index] +
-                                    (Math.Min(cddr, 0) * 15) +  // boost contiguous matches
+                                    (Math.Min(cddr, 3) * 15) +  // boost contiguous matches
                                     60;
                             }
                             else

diff --git a/Source/Assets/FlxCs/Scripts/Score.cs b/Source/Assets/FlxCs/Scripts/Score.cs
@@ -14,5 +14,10 @@ public Score(List<int> indices, int score, int tail)
             this.score = score;
             this.tail = tail;
         }
+
+        public override string ToString()
+        {
+            return  score + " " + Util.ToString(indices);
+        }
     }
 }
diff --git a/Source/Assets/FlxCs/Scripts/Util.cs b/Source/Assets/FlxCs/Scripts/Util.cs
@@ -36,5 +36,17 @@ public static void DictInsert(Dictionary<int, List<int>> result, int key, int va
             List<int> lst = result[key];
             lst.Insert(0, val);
         }
+
+        public static string ToString<T>(List<T> lst)
+        {
+            string str = "";
+
+            foreach (var elm in lst)
+            {
+                str += elm.ToString() + " ";
+            }
+
+            return str;
+        }
     }
 }
diff --git a/Source/Assets/_Project/Scripts/Test.cs b/Source/Assets/_Project/Scripts/Test.cs
@@ -8,25 +8,14 @@ public class Test : MonoBehaviour
     // Start is called before the first frame update
     private void Start()
     {
-        Score score = Flx.Score("switch-to-buffer", "stb");
-
-        print(score.score);
-
-        Print(score.indices);
+        TestOne("TestSomeFunctionExterme", "met");
+        TestOne("MetaX_Version", "met");
     }
 
-    private void Other()
+    private void TestOne(string str, string query)
     {
-        print(Flx.Word('C'));
-
-        var lst = new List<int>() { 1, 2, 3, 4 };
-
-        Flx.IncVec(lst, null, null, null);
-
-        foreach (int i in lst)
-        {
-            print(i);
-        }
+        Score score = Flx.Score(str, query);
+        print(score.ToString());
     }
 
     public static void Print<T>(List<T> lst)
@@ -43,11 +32,15 @@ public static void Print<T>(List<T> lst)
 
     public static void Print<T>(Dictionary<int, List<T>> dict)
     {
+        string str = "";
+
         foreach (KeyValuePair<int, List<T>> entry in dict)
         {
-            Debug.LogWarning(entry.Key);
-            Print(entry.Value);
+            str += entry.Key + " ";
+            //Print(entry.Value);
         }
+
+        Debug.Log(str);
     }
 }
 #endif