killer-sudoku-helper: fix generator

Author: ErikSchierboom

exercises/practice/killer-sudoku-helper/.meta/Example.fs

@@ -9,7 +9,7 @@ module List =
             List.map ((@) [ x ]) (combinations (k - 1) xs)
             @ combinations k xs
 
-let combinations sum size exclude =
+let combinations exclude size sum =
     [ 1..9 ]
     |> List.except exclude
     |> List.combinations size

exercises/practice/killer-sudoku-helper/KillerSudokuHelper.fs

@@ -1,4 +1,4 @@
 module KillerSudokuHelper
 
-let combinations sum size exclude =
+let combinations exclude size sum =
     failwith "Please implement the 'combinations' function"

exercises/practice/killer-sudoku-helper/KillerSudokuHelperTests.fs

@@ -7,61 +7,53 @@ open KillerSudokuHelper
 
 [<Fact>]
 let ``1`` () =
-    combinations 1 1 [] |> should equal [ [ 1 ] ]
+    combinations [] 1 1 |> should equal [[1]]
 
 [<Fact(Skip = "Remove this Skip property to run this test")>]
 let ``2`` () =
-    combinations 2 1 [] |> should equal [ [ 2 ] ]
+    combinations [] 1 2 |> should equal [[2]]
 
 [<Fact(Skip = "Remove this Skip property to run this test")>]
 let ``3`` () =
-    combinations 3 1 [] |> should equal [ [ 3 ] ]
+    combinations [] 1 3 |> should equal [[3]]
 
 [<Fact(Skip = "Remove this Skip property to run this test")>]
 let ``4`` () =
-    combinations 4 1 [] |> should equal [ [ 4 ] ]
+    combinations [] 1 4 |> should equal [[4]]
 
 [<Fact(Skip = "Remove this Skip property to run this test")>]
 let ``5`` () =
-    combinations 5 1 [] |> should equal [ [ 5 ] ]
+    combinations [] 1 5 |> should equal [[5]]
 
 [<Fact(Skip = "Remove this Skip property to run this test")>]
 let ``6`` () =
-    combinations 6 1 [] |> should equal [ [ 6 ] ]
+    combinations [] 1 6 |> should equal [[6]]
 
 [<Fact(Skip = "Remove this Skip property to run this test")>]
 let ``7`` () =
-    combinations 7 1 [] |> should equal [ [ 7 ] ]
+    combinations [] 1 7 |> should equal [[7]]
 
 [<Fact(Skip = "Remove this Skip property to run this test")>]
 let ``8`` () =
-    combinations 8 1 [] |> should equal [ [ 8 ] ]
+    combinations [] 1 8 |> should equal [[8]]
 
 [<Fact(Skip = "Remove this Skip property to run this test")>]
 let ``9`` () =
-    combinations 9 1 [] |> should equal [ [ 9 ] ]
+    combinations [] 1 9 |> should equal [[9]]
 
 [<Fact(Skip = "Remove this Skip property to run this test")>]
 let ``Cage with sum 45 contains all digits 1:9`` () =
-    combinations 45 9 []
-    |> should equal [ [ 1; 2; 3; 4; 5; 6; 7; 8; 9 ] ]
+    combinations [] 9 45 |> should equal [[1; 2; 3; 4; 5; 6; 7; 8; 9]]
 
 [<Fact(Skip = "Remove this Skip property to run this test")>]
 let ``Cage with only 1 possible combination`` () =
-    combinations 7 3 []
-    |> should equal [ [ 1; 2; 4 ] ]
+    combinations [] 3 7 |> should equal [[1; 2; 4]]
 
 [<Fact(Skip = "Remove this Skip property to run this test")>]
 let ``Cage with several combinations`` () =
-    combinations 10 2 []
-    |> should
-        equal
-        [ [ 1; 9 ]
-          [ 2; 8 ]
-          [ 3; 7 ]
-          [ 4; 6 ] ]
+    combinations [] 2 10 |> should equal [[1; 9]; [2; 8]; [3; 7]; [4; 6]]
 
 [<Fact(Skip = "Remove this Skip property to run this test")>]
 let ``Cage with several combinations that is restricted`` () =
-    combinations 10 2 [ 1; 4 ]
-    |> should equal [ [ 2; 8 ]; [ 3; 7 ] ]
+    combinations [1; 4] 2 10 |> should equal [[2; 8]; [3; 7]]
+

generators/Generators.fs

@@ -2074,6 +2074,8 @@ type ResistorColorTrio() =
 
 type KillerSudokuHelper() =
     inherit ExerciseGenerator()
+    
+    override _.MapTestCase testCase = { testCase with Input = testCase.Input.["cage"].ToObject<Map<string, JToken>>() }
 
 type StateOfTicTacToe() =
     inherit ExerciseGenerator()