Merge branch 'main' of https://github.com/powpow58/F-Sharp into main (#10)

* Update IsPalindrome.fs

* Update IsPalindrome.fs

* Updated Perfect Numbers, Check Anagram. Is Palindrome, Lower, Remove Duplicates, Reverse Letters, Reverse Words, Upper Algorithms

* Added Strings Test Methods

* Updated RemoveDeplicatesTests

* Updated ReverseLettersTests

* Fixed String Algorithms

* Update RabinKarp.fs

* Jaro Winkler

Co-authored-by: Allister Isaiah Harvey <[email protected]>

Author: martial-plains

Algorithms.Tests/Strings/JaroWinklerTests.fs

@@ -1,4 +1,4 @@
-namespace Algorithms.Tests.Strings
+namespace Algorithms.Tests.Strings
 
 open Microsoft.VisualStudio.TestTools.UnitTesting
 open Algorithms.Strings
@@ -7,13 +7,13 @@ open Algorithms.Strings
 type JaroWinklerTests () =
     [<TestMethod>]
     [<DataRow("martha", "marhta", 0.9611111111111111)>]
-    [<DataRow("CRATE", "TRACE", 0.8483333333333334)>]
+    [<DataRow("CRATE", "TRACE", 0.7333333333333334)>]
     [<DataRow("test", "dbdbdbdb", 0.0)>]
-    [<DataRow("hello world", "HeLLo W0rlD", 0.7131313131313132)>]
+    [<DataRow("test", "test", 1.0)>]
+    [<DataRow("hello world", "HeLLo W0rlD", 0.6363636363636364)>]
     [<DataRow("test", "", 0.0)>]
-    [<DataRow("hello", "world", 0.49)>]
-    [<DataRow("hell**o", "*world", 0.373015873015873)>]
+    [<DataRow("hello", "world", 0.4666666666666666)>]
+    [<DataRow("hell**o", "*world", 0.4365079365079365)>]
     member this.jaroWinkler (str1:string, str2:string, expected:float) =
         let actual = JaroWinkler.jaroWinkler(str1, str2)
         Assert.AreEqual(expected, actual)
-

Algorithms/Strings/JaroWinkler.fs

@@ -1,4 +1,4 @@
-namespace Algorithms.Strings
+namespace Algorithms.Strings
 
 open Microsoft.FSharp.Collections
 
@@ -16,39 +16,40 @@ module JaroWinkler =
             let mutable istr1 = _str1
             let mutable istr2 = _str2
             let mutable matched = []
-
+    
             let limit =
                 int (floor (double (min _str1.Length str2.Length) / 2.0))
-
+    
             istr1
             |> Seq.iteri
                 (fun i l ->
-                    let left = (int) (max 0 (i - limit))
-
-                    let right = (int) (min (i + limit + 1) istr2.Length)
-
-                    if (istr2.[left..right]).Contains(l) then
+                    let left = int(max 0 (i - limit))
+    
+                    let right = int(min (i + limit + 1) istr2.Length)
+    
+                    if (istr2.[left..right - 1]).Contains(l) then
                         matched <- List.append matched [ (string) l ]
-                        istr2 <- $"{istr2.[0..istr2.IndexOf(l)]} {istr2.[istr2.IndexOf(l) + 1..]}")
-
+                        let myIndex = (istr2.IndexOf(l))
+                        istr2 <- $"{istr2.[0..istr2.IndexOf(l) - 1]} {istr2.[istr2.IndexOf(l) + 1..]}")
+    
             matched |> List.fold (+) ""
-
+    
         // matching characters
         let matching1 = getMatchedCharacters (str1, str2)
         let matching2 = getMatchedCharacters (str2, str1)
         let matchCount = matching1.Length
         let mutable jaro = 0.0
-
+    
         // Transposition
         let transpositions =
             floor (
                 double (
                     (double)
-                        [ for c1, c2 in List.zip [ matching1 ] [ matching2 ] -> (c1, c2) ]
+                        [ for c1, c2 in List.zip [ matching1 ] [ matching2 ] do if c1 <> c2 then (c1, c2) ]
                             .Length
                 )
             )
-
+    
         if matchCount = 0 then
             jaro <- 0.0
         else
@@ -58,13 +59,18 @@ module JaroWinkler =
                    + (double) matchCount / (double) str2.Length
                    + ((double) matchCount - transpositions)
                      / (double) matchCount)
-
+    
         // Common prefix up to 4 characters
         let mutable prefixLen = 0
 
+        let mutable c1C2BoolList : bool list = []
+
         if str1.Length = str2.Length then
             for c1, c2 in Array.zip (str1.[..4].ToCharArray()) (str2.[..4].ToCharArray()) do
                 if c1 = c2 then
-                    prefixLen <- prefixLen + 1
-
-        jaro + 0.1 * (double) prefixLen * (1.0 - jaro)
+                    c1C2BoolList <- List.append c1C2BoolList [true]
+                else
+                    c1C2BoolList <- List.append c1C2BoolList [false]
+            if (c1C2BoolList |> List.exists(fun x -> (not x))) then
+                prefixLen <- prefixLen + (c1C2BoolList |> List.findIndex(fun x -> (not x)))
+        jaro + 0.1 * (double) prefixLen * (1.0 - jaro)