trackler 2.2.1.54 → 2.2.1.55

data/tracks/fsharp/exercises/ocr-numbers/Example.fs

@@ -6,73 +6,73 @@ let characterHeight = 4
 let digitPatterns = 
     Map.ofList 
         [(
-          [|" _ ";
+          [ " _ ";
             "| |";
             "|_|"; 
-            "   "|],
+            "   " ],
             "0"
         );
         (
-          [|"   ";
+          [ "   ";
             "  |";
             "  |";
-            "   "|],
+            "   "],
             "1"
         );
         (
-          [|" _ ";
+          [ " _ ";
             " _|";
             "|_ ";
-            "   "|],
+            "   " ],
             "2"
         );
         (
-          [|" _ ";
+          [ " _ ";
             " _|";
             " _|";
-            "   "|],
+            "   " ],
             "3"
         );
         (
-          [|"   ";
+          [ "   ";
             "|_|";
             "  |";
-            "   "|],
+            "   " ],
             "4"
         );
         (
-          [|" _ ";
+          [ " _ ";
             "|_ ";
             " _|";
-            "   "|],
+            "   " ],
             "5"
         );
         (
-          [|" _ ";
+          [ " _ ";
             "|_ ";
             "|_|";
-            "   "|],
+            "   " ],
             "6"
         );
         (
-          [|" _ ";
+          [ " _ ";
             "  |";
             "  |";
-            "   "|],
+            "   " ],
             "7"
         );
         (
-          [|" _ ";
+          [ " _ ";
             "|_|";
             "|_|";
-            "   "|],
+            "   " ],
             "8"
         );
         (
-          [|" _ ";
+          [ " _ ";
             "|_|";
             " _|";
-            "   "|],
+            "   " ],
             "9"
         )]
 
@@ -81,25 +81,33 @@ let matchCharacter input =
     | Some x -> x
     | None -> "?"
 
-let rows (input:string) = 
-    input.Split('\n')
-    |> Array.chunkBySize characterHeight
+let rows (input:string list) = List.chunkBySize characterHeight input
 
-let rowToCharacters (row: string[]) = 
-    let chars = (row |> Array.head |> String.length) / characterWidth |> int
+let rowToCharacters (row: string list) = 
+    let chars = (row |> List.head |> String.length) / characterWidth |> int
     let char i (str: string) = str.Substring(i * characterWidth, characterWidth)
 
-    Array.init chars (fun i -> Array.map (char i) row)
+    List.init chars (fun i -> List.map (char i) row)
 
-let characters input = input |> rows |> Array.map rowToCharacters
+let characters input = input |> rows |> List.map rowToCharacters
 
-let rowToDigits (row: string[] []) = 
+let rowToDigits (row: string list list) = 
     row 
-    |> Array.map matchCharacter 
-    |> Array.reduce (fun x y -> x + "" + y)
+    |> List.map matchCharacter 
+    |> List.reduce (fun x y -> x + "" + y)
 
-let convert (input: string) =    
-    input
-    |> characters 
-    |> Array.map rowToDigits
-    |> Array.reduce (fun x y -> x + "," + y)
+let invalidNumberOfColumns row = String.length row % characterWidth <> 0
+
+let invalidNumberOfRows rows = List.length rows % characterHeight <> 0
+
+let isInvalid input = invalidNumberOfRows input || List.exists invalidNumberOfColumns input
+
+let convert (input: string list) = 
+    if isInvalid input then
+        None
+    else
+        input
+        |> characters 
+        |> List.map rowToDigits
+        |> List.reduce (fun x y -> x + "," + y)
+        |> Some

data/tracks/fsharp/exercises/ocr-numbers/OcrNumbersTest.fs

@@ -1,134 +1,169 @@
+// This file was auto-generated based on version 1.0.0 of the canonical data.
+
 module OcrNumbersTest
 
-open Xunit
 open FsUnit.Xunit
+open Xunit
 
 open OcrNumbers
 
 [<Fact>]
-let ``Recognizes zero`` () = 
-    let converted = convert (" _ " + "\n" +
-                              "| |" + "\n" +
-                              "|_|" + "\n" +
-                              "   ")
-    converted |> should equal "0"
+let ``Recognizes 0`` () =
+    let input = 
+        [ " _ "
+          "| |"
+          "|_|"
+          "   " ]
+    convert input |> should equal (Some "0")
+
+[<Fact(Skip = "Remove to run test")>]
+let ``Recognizes 1`` () =
+    let input = 
+        [ "   "
+          "  |"
+          "  |"
+          "   " ]
+    convert input |> should equal (Some "1")
+
+[<Fact(Skip = "Remove to run test")>]
+let ``Unreadable but correctly sized inputs return ?`` () =
+    let input = 
+        [ "   "
+          "  _"
+          "  |"
+          "   " ]
+    convert input |> should equal (Some "?")
+
+[<Fact(Skip = "Remove to run test")>]
+let ``Input with a number of lines that is not a multiple of four raises an error`` () =
+    let input = 
+        [ " _ "
+          "| |"
+          "   " ]
+    convert input |> should equal None
+
+[<Fact(Skip = "Remove to run test")>]
+let ``Input with a number of columns that is not a multiple of three raises an error`` () =
+    let input = 
+        [ "    "
+          "   |"
+          "   |"
+          "    " ]
+    convert input |> should equal None
+
+[<Fact(Skip = "Remove to run test")>]
+let ``Recognizes 110101100`` () =
+    let input = 
+        [ "       _     _        _  _ "
+          "  |  || |  || |  |  || || |"
+          "  |  ||_|  ||_|  |  ||_||_|"
+          "                           " ]
+    convert input |> should equal (Some "110101100")
+
+[<Fact(Skip = "Remove to run test")>]
+let ``Garbled numbers in a string are replaced with ?`` () =
+    let input = 
+        [ "       _     _           _ "
+          "  |  || |  || |     || || |"
+          "  |  | _|  ||_|  |  ||_||_|"
+          "                           " ]
+    convert input |> should equal (Some "11?10?1?0")
+
+[<Fact(Skip = "Remove to run test")>]
+let ``Recognizes 2`` () =
+    let input = 
+        [ " _ "
+          " _|"
+          "|_ "
+          "   " ]
+    convert input |> should equal (Some "2")
 
-[<Fact(Skip = "Remove to run test")>]
-let ``Recognizes one`` () = 
-    let converted = convert ("   " + "\n" +
-                             "  |" + "\n" +
-                             "  |" + "\n" +
-                             "   ")
-    converted |> should equal "1"
+[<Fact(Skip = "Remove to run test")>]
+let ``Recognizes 3`` () =
+    let input = 
+        [ " _ "
+          " _|"
+          " _|"
+          "   " ]
+    convert input |> should equal (Some "3")
+
+[<Fact(Skip = "Remove to run test")>]
+let ``Recognizes 4`` () =
+    let input = 
+        [ "   "
+          "|_|"
+          "  |"
+          "   " ]
+    convert input |> should equal (Some "4")
+
+[<Fact(Skip = "Remove to run test")>]
+let ``Recognizes 5`` () =
+    let input = 
+        [ " _ "
+          "|_ "
+          " _|"
+          "   " ]
+    convert input |> should equal (Some "5")
+
+[<Fact(Skip = "Remove to run test")>]
+let ``Recognizes 6`` () =
+    let input = 
+        [ " _ "
+          "|_ "
+          "|_|"
+          "   " ]
+    convert input |> should equal (Some "6")
+
+[<Fact(Skip = "Remove to run test")>]
+let ``Recognizes 7`` () =
+    let input = 
+        [ " _ "
+          "  |"
+          "  |"
+          "   " ]
+    convert input |> should equal (Some "7")
+
+[<Fact(Skip = "Remove to run test")>]
+let ``Recognizes 8`` () =
+    let input = 
+        [ " _ "
+          "|_|"
+          "|_|"
+          "   " ]
+    convert input |> should equal (Some "8")
+
+[<Fact(Skip = "Remove to run test")>]
+let ``Recognizes 9`` () =
+    let input = 
+        [ " _ "
+          "|_|"
+          " _|"
+          "   " ]
+    convert input |> should equal (Some "9")
+
+[<Fact(Skip = "Remove to run test")>]
+let ``Recognizes string of decimal numbers`` () =
+    let input = 
+        [ "    _  _     _  _  _  _  _  _ "
+          "  | _| _||_||_ |_   ||_||_|| |"
+          "  ||_  _|  | _||_|  ||_| _||_|"
+          "                              " ]
+    convert input |> should equal (Some "1234567890")
+
+[<Fact(Skip = "Remove to run test")>]
+let ``Numbers separated by empty lines are recognized. Lines are joined by commas.`` () =
+    let input = 
+        [ "    _  _ "
+          "  | _| _|"
+          "  ||_  _|"
+          "         "
+          "    _  _ "
+          "|_||_ |_ "
+          "  | _||_|"
+          "         "
+          " _  _  _ "
+          "  ||_||_|"
+          "  ||_| _|"
+          "         " ]
+    convert input |> should equal (Some "123,456,789")
 
-[<Fact(Skip = "Remove to run test")>]
-let ``Recognizes two`` () = 
-    let converted = convert (" _ " + "\n" +
-                             " _|" + "\n" +
-                             "|_ " + "\n" +
-                             "   ")
-    converted |> should equal "2"
-
-[<Fact(Skip = "Remove to run test")>]
-let ``Recognizes three`` () = 
-    let converted = convert (" _ " + "\n" +
-                             " _|" + "\n" +
-                             " _|" + "\n" +
-                             "   ")
-    converted |> should equal "3"
-
-[<Fact(Skip = "Remove to run test")>]
-let ``Recognizes four`` () = 
-    let converted = convert ("   " + "\n" +
-                             "|_|" + "\n" +
-                             "  |" + "\n" +
-                             "   ")
-    converted |> should equal "4"
-
-[<Fact(Skip = "Remove to run test")>]
-let ``Recognizes five`` () = 
-    let converted = convert (" _ " + "\n" +
-                             "|_ " + "\n" +
-                             " _|" + "\n" +
-                             "   ")
-    converted |> should equal "5"
-
-[<Fact(Skip = "Remove to run test")>]
-let ``Recognizes six`` () = 
-    let converted = convert (" _ " + "\n" +
-                             "|_ " + "\n" +
-                             "|_|" + "\n" +
-                             "   ")
-    converted |> should equal "6"
-
-[<Fact(Skip = "Remove to run test")>]
-let ``Recognizes seven`` () = 
-    let converted = convert (" _ " + "\n" +
-                             "  |" + "\n" +
-                             "  |" + "\n" +
-                             "   ")
-    converted |> should equal "7"
-
-[<Fact(Skip = "Remove to run test")>]
-let ``Recognizes eight`` () = 
-    let converted = convert (" _ " + "\n" +
-                             "|_|" + "\n" +
-                             "|_|" + "\n" +
-                             "   ")
-    converted |> should equal "8"
-
-[<Fact(Skip = "Remove to run test")>]
-let ``Recognizes nine`` () = 
-    let converted = convert (" _ " + "\n" +
-                             "|_|" + "\n" +
-                             " _|" + "\n" +
-                             "   ")
-    converted |> should equal "9"
-
-[<Fact(Skip = "Remove to run test")>]
-let ``Recognizes garble`` () = 
-    let converted = convert ("   " + "\n" +
-                             "| |" + "\n" +
-                             "| |" + "\n" +
-                             "   ")
-    converted |> should equal "?"
-
-[<Fact(Skip = "Remove to run test")>]
-let ``Recognizes ten`` () = 
-    let converted = convert ("    _ " + "\n" +
-                             "  || |" + "\n" +
-                             "  ||_|" + "\n" +
-                             "       ")
-    converted |> should equal "10"
-
-[<Fact(Skip = "Remove to run test")>]
-let ``Recognizes 110101100`` () = 
-    let converted = convert ("       _     _        _  _ " + "\n" +
-                             "  |  || |  || |  |  || || |" + "\n" +
-                             "  |  ||_|  ||_|  |  ||_||_|" + "\n" +
-                             "                            ")
-    converted |> should equal "110101100"
-
-[<Fact(Skip = "Remove to run test")>]
-let ``Recognizes numbers and garble`` () = 
-    let converted = convert ("       _     _           _ " + "\n" +
-                             "  |  || |  || |     || || |" + "\n" +
-                             "  |  | _|  ||_|  |  ||_||_|" + "\n" +
-                             "                            ")
-    converted |> should equal "11?10?1?0"
-
-[<Fact(Skip = "Remove to run test")>]
-let ``Recognizes multiple rows`` () = 
-    let converted = convert ("    _  _ " + "\n" +
-                             "  | _| _|" + "\n" +
-                             "  ||_  _|" + "\n" +
-                             "          " + "\n" +
-                             "    _  _ " + "\n" +
-                             "|_||_ |_ " + "\n" +
-                             "  | _||_|" + "\n" +
-                             "          " + "\n" +
-                             " _  _  _ " + "\n" +
-                             "  ||_||_|" + "\n" +
-                             "  ||_| _|" + "\n" +
-                             "          ")
-    converted |> should equal "123,456,789"

data/tracks/fsharp/exercises/two-fer/Example.fs

@@ -1,4 +1,6 @@
 module TwoFer
 
-let getResponse input =
-    sprintf "One for %s, one for me." (defaultArg input "you")
+let name input =
+    input 
+    |> Option.defaultValue  "you"
+    |> sprintf "One for %s, one for me."

data/tracks/fsharp/exercises/two-fer/TwoFer.fs

@@ -1,3 +1,3 @@
 module TwoFer
 
-let getResponse (input: string option): string = failwith "You need to implement this function."
+let name (input: string option): string = failwith "You need to implement this function."