trackler 2.2.1.128 → 2.2.1.129

data/tracks/fsharp/exercises/transpose/Transpose.fsproj

@@ -13,10 +13,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
     <PackageReference Include="xunit" Version="2.3.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
-    <PackageReference Include="FsUnit.xUnit" Version="3.0.0" />
+    <PackageReference Include="FsUnit.xUnit" Version="3.1.0" />
     <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
   </ItemGroup>
 

data/tracks/fsharp/exercises/tree-building/TreeBuilding.fsproj

@@ -13,10 +13,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
     <PackageReference Include="xunit" Version="2.3.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
-    <PackageReference Include="FsUnit.xUnit" Version="3.0.0" />
+    <PackageReference Include="FsUnit.xUnit" Version="3.1.0" />
     <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
   </ItemGroup>
 

data/tracks/fsharp/exercises/triangle/Triangle.fsproj

@@ -13,10 +13,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
     <PackageReference Include="xunit" Version="2.3.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
-    <PackageReference Include="FsUnit.xUnit" Version="3.0.0" />
+    <PackageReference Include="FsUnit.xUnit" Version="3.1.0" />
     <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
   </ItemGroup>
 

data/tracks/fsharp/exercises/trinary/Trinary.fsproj

@@ -13,10 +13,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
     <PackageReference Include="xunit" Version="2.3.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
-    <PackageReference Include="FsUnit.xUnit" Version="3.0.0" />
+    <PackageReference Include="FsUnit.xUnit" Version="3.1.0" />
     <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
   </ItemGroup>
 

data/tracks/fsharp/exercises/twelve-days/TwelveDays.fsproj

@@ -13,10 +13,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
     <PackageReference Include="xunit" Version="2.3.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
-    <PackageReference Include="FsUnit.xUnit" Version="3.0.0" />
+    <PackageReference Include="FsUnit.xUnit" Version="3.1.0" />
     <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
   </ItemGroup>
 

data/tracks/fsharp/exercises/two-bucket/TwoBucket.fsproj

@@ -13,10 +13,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
     <PackageReference Include="xunit" Version="2.3.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
-    <PackageReference Include="FsUnit.xUnit" Version="3.0.0" />
+    <PackageReference Include="FsUnit.xUnit" Version="3.1.0" />
     <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
   </ItemGroup>
 

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

@@ -13,10 +13,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
     <PackageReference Include="xunit" Version="2.3.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
-    <PackageReference Include="FsUnit.xUnit" Version="3.0.0" />
+    <PackageReference Include="FsUnit.xUnit" Version="3.1.0" />
     <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
   </ItemGroup>
 

data/tracks/fsharp/exercises/variable-length-quantity/VariableLengthQuantity.fsproj

@@ -13,10 +13,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
     <PackageReference Include="xunit" Version="2.3.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
-    <PackageReference Include="FsUnit.xUnit" Version="3.0.0" />
+    <PackageReference Include="FsUnit.xUnit" Version="3.1.0" />
     <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
   </ItemGroup>
 

data/tracks/fsharp/exercises/word-count/WordCount.fsproj

@@ -13,10 +13,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
     <PackageReference Include="xunit" Version="2.3.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
-    <PackageReference Include="FsUnit.xUnit" Version="3.0.0" />
+    <PackageReference Include="FsUnit.xUnit" Version="3.1.0" />
     <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
   </ItemGroup>
 

data/tracks/fsharp/exercises/word-search/WordSearch.fsproj

@@ -13,10 +13,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
     <PackageReference Include="xunit" Version="2.3.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
-    <PackageReference Include="FsUnit.xUnit" Version="3.0.0" />
+    <PackageReference Include="FsUnit.xUnit" Version="3.1.0" />
     <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
   </ItemGroup>
 

data/tracks/fsharp/exercises/word-search/WordSearchTest.fs

@@ -1,4 +1,4 @@
-// This file was auto-generated based on version 1.1.0 of the canonical data.
+// This file was auto-generated based on version 1.2.0 of the canonical data.
 
 module WordSearchTest
 

data/tracks/fsharp/exercises/wordy/Wordy.fsproj

@@ -13,10 +13,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
     <PackageReference Include="xunit" Version="2.3.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
-    <PackageReference Include="FsUnit.xUnit" Version="3.0.0" />
+    <PackageReference Include="FsUnit.xUnit" Version="3.1.0" />
     <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
   </ItemGroup>
 

data/tracks/fsharp/exercises/yacht/Example.fs

@@ -0,0 +1,65 @@
+module Yacht
+
+type Category = 
+    | Ones
+    | Twos
+    | Threes
+    | Fours
+    | Fives
+    | Sixes
+    | FullHouse
+    | FourOfAKind
+    | LittleStraight
+    | BigStraight
+    | Choice
+    | Yacht
+
+let private diceWithCount dice = 
+    dice
+    |> List.countBy id
+    |> List.sortByDescending snd
+
+let private valueScore value dice =
+    let count = 
+        dice 
+        |> List.filter ((=) value) 
+        |> List.length 
+    count * value
+
+let private fullHouseScore dice =
+    match diceWithCount dice with
+    | [(_, 3); (_, 2)] -> List.sum dice
+    | _ -> 0
+
+let private fourOfAKindScore dice =
+    match diceWithCount dice with
+    | [(value, 4); _] -> value * 4
+    | [(value, 5)]    -> value * 4
+    | _ -> 0
+
+let private littleStraightScore dice =
+    if List.sort dice = [1; 2; 3; 4; 5] then 30 else 0
+
+let private bigStraightScore dice =
+    if List.sort dice = [2; 3; 4; 5; 6] then 30 else 0
+
+let private choiceScore dice = 
+    List.sum dice
+
+let private yachtScore dice = 
+    if dice |> List.distinct |> List.length = 1 then 50 else 0
+
+let score category dice = 
+    match category with
+    | Ones           -> valueScore 1 dice
+    | Twos           -> valueScore 2 dice
+    | Threes         -> valueScore 3 dice
+    | Fours          -> valueScore 4 dice
+    | Fives          -> valueScore 5 dice
+    | Sixes          -> valueScore 6 dice
+    | FullHouse      -> fullHouseScore dice
+    | FourOfAKind    -> fourOfAKindScore dice
+    | LittleStraight -> littleStraightScore dice
+    | BigStraight    -> bigStraightScore dice
+    | Choice         -> choiceScore dice
+    | Yacht          -> yachtScore dice

data/tracks/fsharp/exercises/yacht/Program.fs

@@ -0,0 +1 @@
+module Program = let [<EntryPoint>] main _ = 0

data/tracks/fsharp/exercises/yacht/README.md

@@ -0,0 +1,34 @@
+# Score a single throw of dice in *Yacht*
+
+The dice game [Yacht](https://en.wikipedia.org/wiki/Yacht_(dice_game)) is from
+the same family as Poker Dice, Generala and particularly Yahtzee, of which it
+is a precursor. In the game, five dice are rolled and the result can be entered
+in any of twelve categories. The score of a throw of the dice depends on
+category chosen.
+
+## Scores in Yacht
+
+    Category    Score                   Example
+    Ones            1 × number of ones      1 1 1 4 5 scores 3
+    Twos            2 × number of twos      2 2 3 4 5 scores 4
+    Threes          3 × number of threes    3 3 3 3 3 scores 15
+    Fours           4 × number of fours     1 2 3 3 5 scores 0
+    Fives           5 × number of fives     5 1 5 2 5 scores 15
+    Sixes           6 × number of sixes     2 3 4 5 6 scores 6
+    Full House      Total of the dice       3 3 3 5 5 scores 19
+    Four of a Kind  Total of the four dice  4 4 4 4 6 scores 16
+    Little Straight 30 points               1 2 3 4 5 scores 30 
+    Big Straight    30 points               2 3 4 5 6 scores 30
+    Choice          Sum of the dice         2 3 3 4 6 scores 18
+    Yacht           50 points               4 4 4 4 4 scores 50
+
+If the dice do not satisfy the requirements of a category, the score is zero.
+If, for example, *Four Of A Kind* is entered in the *Yacht* category, zero
+points are scored. A *Yacht* scores zero if entered in the *Full House* category.
+
+## Task 
+Given a list of values for five dice and a category, your solution should return
+the score of the dice for that category. If the dice do not satisfy the requirements
+of the category your solution should return 0. You can assume that five values
+will always be presented, and the value of each will be between one and six
+inclusively. You should not assume that the dice are ordered.

data/tracks/fsharp/exercises/yacht/Yacht.fs

@@ -0,0 +1,17 @@
+module Yacht
+
+type Category = 
+    | Ones
+    | Twos
+    | Threes
+    | Fours
+    | Fives
+    | Sixes
+    | FullHouse
+    | FourOfAKind
+    | LittleStraight
+    | BigStraight
+    | Choice
+    | Yacht
+
+let score category dice = failwith "You need to implement this function."

data/tracks/fsharp/exercises/yacht/Yacht.fsproj

@@ -0,0 +1,23 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
+
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Yacht.fs" />
+    <Compile Include="YachtTest.fs" />
+    <Compile Include="Program.fs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
+    <PackageReference Include="xunit" Version="2.3.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
+    <PackageReference Include="FsUnit.xUnit" Version="3.1.0" />
+    <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
+  </ItemGroup>
+
+</Project>

data/tracks/fsharp/exercises/yacht/YachtTest.fs

@@ -0,0 +1,113 @@
+// This file was auto-generated based on version 1.0.0 of the canonical data.
+
+module YachtTest
+
+open FsUnit.Xunit
+open Xunit
+
+open Yacht
+
+[<Fact>]
+let ``Yacht`` () =
+    score Category.Yacht [5; 5; 5; 5; 5] |> should equal 50
+
+[<Fact(Skip = "Remove to run test")>]
+let ``Not Yacht`` () =
+    score Category.Yacht [1; 3; 3; 2; 5] |> should equal 0
+
+[<Fact(Skip = "Remove to run test")>]
+let ``Ones`` () =
+    score Category.Ones [1; 1; 1; 3; 5] |> should equal 3
+
+[<Fact(Skip = "Remove to run test")>]
+let ``Ones, out of order`` () =
+    score Category.Ones [3; 1; 1; 5; 1] |> should equal 3
+
+[<Fact(Skip = "Remove to run test")>]
+let ``No ones`` () =
+    score Category.Ones [4; 3; 6; 5; 5] |> should equal 0
+
+[<Fact(Skip = "Remove to run test")>]
+let ``Twos`` () =
+    score Category.Twos [2; 3; 4; 5; 6] |> should equal 2
+
+[<Fact(Skip = "Remove to run test")>]
+let ``Fours`` () =
+    score Category.Fours [1; 4; 1; 4; 1] |> should equal 8
+
+[<Fact(Skip = "Remove to run test")>]
+let ``Yacht counted as threes`` () =
+    score Category.Threes [3; 3; 3; 3; 3] |> should equal 15
+
+[<Fact(Skip = "Remove to run test")>]
+let ``Yacht of 3s counted as fives`` () =
+    score Category.Fives [3; 3; 3; 3; 3] |> should equal 0
+
+[<Fact(Skip = "Remove to run test")>]
+let ``Sixes`` () =
+    score Category.Sixes [2; 3; 4; 5; 6] |> should equal 6
+
+[<Fact(Skip = "Remove to run test")>]
+let ``Full house two small, three big`` () =
+    score Category.FullHouse [2; 2; 4; 4; 4] |> should equal 16
+
+[<Fact(Skip = "Remove to run test")>]
+let ``Full house three small, two big`` () =
+    score Category.FullHouse [5; 3; 3; 5; 3] |> should equal 19
+
+[<Fact(Skip = "Remove to run test")>]
+let ``Two pair is not a full house`` () =
+    score Category.FullHouse [2; 2; 4; 4; 5] |> should equal 0
+
+[<Fact(Skip = "Remove to run test")>]
+let ``Yacht is not a full house`` () =
+    score Category.FullHouse [2; 2; 2; 2; 2] |> should equal 0
+
+[<Fact(Skip = "Remove to run test")>]
+let ``Four of a Kind`` () =
+    score Category.FourOfAKind [6; 6; 4; 6; 6] |> should equal 24
+
+[<Fact(Skip = "Remove to run test")>]
+let ``Yacht can be scored as Four of a Kind`` () =
+    score Category.FourOfAKind [3; 3; 3; 3; 3] |> should equal 12
+
+[<Fact(Skip = "Remove to run test")>]
+let ``Full house is not Four of a Kind`` () =
+    score Category.FourOfAKind [3; 3; 3; 5; 5] |> should equal 0
+
+[<Fact(Skip = "Remove to run test")>]
+let ``Little Straight`` () =
+    score Category.LittleStraight [3; 5; 4; 1; 2] |> should equal 30
+
+[<Fact(Skip = "Remove to run test")>]
+let ``Little Straight as Big Straight`` () =
+    score Category.BigStraight [1; 2; 3; 4; 5] |> should equal 0
+
+[<Fact(Skip = "Remove to run test")>]
+let ``Four in order but not a little straight`` () =
+    score Category.LittleStraight [1; 1; 2; 3; 4] |> should equal 0
+
+[<Fact(Skip = "Remove to run test")>]
+let ``No pairs but not a little straight`` () =
+    score Category.LittleStraight [1; 2; 3; 4; 6] |> should equal 0
+
+[<Fact(Skip = "Remove to run test")>]
+let ``Minimum is 1, maximum is 5, but not a little straight`` () =
+    score Category.LittleStraight [1; 1; 3; 4; 5] |> should equal 0
+
+[<Fact(Skip = "Remove to run test")>]
+let ``Big Straight`` () =
+    score Category.BigStraight [4; 6; 2; 5; 3] |> should equal 30
+
+[<Fact(Skip = "Remove to run test")>]
+let ``Big Straight as little straight`` () =
+    score Category.LittleStraight [6; 5; 4; 3; 2] |> should equal 0
+
+[<Fact(Skip = "Remove to run test")>]
+let ``Choice`` () =
+    score Category.Choice [3; 3; 5; 6; 6] |> should equal 23
+
+[<Fact(Skip = "Remove to run test")>]
+let ``Yacht as choice`` () =
+    score Category.Choice [2; 2; 2; 2; 2] |> should equal 10
+

data/tracks/fsharp/exercises/zebra-puzzle/ZebraPuzzle.fsproj

@@ -13,10 +13,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
     <PackageReference Include="xunit" Version="2.3.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
-    <PackageReference Include="FsUnit.xUnit" Version="3.0.0" />
+    <PackageReference Include="FsUnit.xUnit" Version="3.1.0" />
     <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
   </ItemGroup>
 

data/tracks/fsharp/exercises/zipper/Zipper.fsproj

@@ -13,10 +13,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
     <PackageReference Include="xunit" Version="2.3.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
-    <PackageReference Include="FsUnit.xUnit" Version="3.0.0" />
+    <PackageReference Include="FsUnit.xUnit" Version="3.1.0" />
     <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
   </ItemGroup>
 

data/tracks/fsharp/generators/CanonicalData.fs

@@ -22,10 +22,6 @@ type CanonicalData =
       Version: string
       Cases: CanonicalDataCase list }
 
-type CanonicalDataFormat = 
-    | Old
-    | New
-
 let [<Literal>] private ProblemSpecificationsGitUrl = "https://github.com/exercism/problem-specifications.git";
 let [<Literal>] private ProblemSpecificationsBranch = "master";
 let [<Literal>] private ProblemSpecificationsRemote = "origin";
@@ -77,23 +73,9 @@ type CanonicalDataConverter() =
         |> Json.parentsAndSelf
         |> List.choose descriptionFromJToken
 
-    let createInputFromJTokenInNewFormat (properties: Map<string, obj>) = 
-        (properties.["input"] :?> JObject)
-        |> jTokenToMap
-
-    let createInputFromJTokenInOldFormat (properties: Map<string, obj>) = 
-        properties
-        |> Map.filter (fun key _ -> List.contains key ["expected"; "property"; "description"; "comments"] |> not)
-
-    let detectCanonicalDataFormatFromJToken (properties: Map<string, obj>) = 
-        match properties.ContainsKey "input" && properties.["input"] :? JObject with
-        | true  -> New
-        | false -> Old
-
     let createInputFromJToken (properties: Map<string, obj>) = 
-        match detectCanonicalDataFormatFromJToken properties with
-        | Old -> createInputFromJTokenInOldFormat properties
-        | New -> createInputFromJTokenInNewFormat properties
+        properties.["input"] :?> JObject
+        |> jTokenToMap
 
     let createCanonicalDataCaseFromJToken (jToken: JToken) =
         let properties = jTokenToMap jToken

data/tracks/fsharp/generators/Common.fs

@@ -72,7 +72,7 @@ module String =
 
     let equals (x: string) (y: string) = String.Equals(x, y, StringComparison.OrdinalIgnoreCase)
 
-    let humanize (str: string) = str.Humanize()
+    let dehumanize (str: string) = str.Dehumanize()
 
     let camelize (str: string) = str.Camelize()
 

data/tracks/fsharp/generators/Generators.fs

@@ -24,7 +24,7 @@ type AllYourBase() =
 type Allergies() =
     inherit GeneratorExercise()
 
-    let toAllergen (jToken: JToken) =  sprintf "Allergen.%s" (jToken.ToString() |> String.humanize)
+    let toAllergen (jToken: JToken) =  sprintf "Allergen.%s" (jToken.ToString() |> String.dehumanize)
 
     let renderAllergicToAssert canonicalDataCase (jToken: JToken) =
         let substance = jToken.["substance"] |> toAllergen
@@ -240,8 +240,8 @@ type CircularBuffer() =
 
     override this.RenderArrange canonicalDataCase = 
         seq {
-            yield sprintf "let buffer1 = mkCircularBuffer %i" (canonicalDataCase.Properties.["capacity"] :?> int64)
-            let operations = (canonicalDataCase.Properties.["operations"] :?> JArray)
+            yield sprintf "let buffer1 = mkCircularBuffer %i" (canonicalDataCase.Input.["capacity"] :?> int64)
+            let operations = (canonicalDataCase.Input.["operations"] :?> JArray)
             let mutable ind = 2
             let lastInd = operations.Count + 1 
             for op in operations do
@@ -609,7 +609,7 @@ type Isogram() =
 type KindergartenGarden() =
     inherit GeneratorExercise()
 
-    let toPlant (jToken: JToken) =  sprintf "Plant.%s" (jToken.ToString() |> String.humanize)
+    let toPlant (jToken: JToken) =  sprintf "Plant.%s" (jToken.ToString() |> String.dehumanize)
 
     override __.RenderExpected (_, _, value) = 
         value :?> JArray 
@@ -822,7 +822,7 @@ type PascalsTriangle() =
 type PerfectNumbers() =
     inherit GeneratorExercise()
 
-    let toClassification value = string value |> String.humanize
+    let toClassification value = string value |> String.dehumanize
 
     override __.RenderExpected (_, _, value) = 
         value 
@@ -854,7 +854,7 @@ type Pov() =
     let isNull x = match x with null -> true | _ -> false
 
     override __.RenderSetup _ = 
-        ["let rec graphToList graph = "
+        ["let rec graphToList (graph: Graph<'a>) = "
          "    let right ="
          "        graph.children"
          "        |> List.sortBy (fun x -> x.value)"
@@ -883,7 +883,7 @@ type Pov() =
     override this.RenderArrange canonicalDataCase =
         seq {
             yield 
-                canonicalDataCase.Properties.["tree"]
+                canonicalDataCase.Input.["tree"]
                 |> this.RenderNode 
                 |> sprintf "let tree = %s" 
 
@@ -901,17 +901,17 @@ type Pov() =
         match canonicalDataCase.Property with
         | "fromPov" -> 
             let from = 
-                canonicalDataCase.Properties.["from"]
+                canonicalDataCase.Input.["from"]
                 |> formatValue
             match isNull canonicalDataCase.Expected with
             | false -> sprintf "fromPOV %s tree |> mapToList " from
             | true -> sprintf "fromPOV %s tree " from
         | "pathTo" -> 
             let fromValue = 
-                canonicalDataCase.Properties.["from"] 
+                canonicalDataCase.Input.["from"] 
                 |> formatValue
             let toValue = 
-                canonicalDataCase.Properties.["to"] 
+                canonicalDataCase.Input.["to"] 
                 |> formatValue
             sprintf "tracePathBetween %s %s tree" fromValue toValue
         | _ -> ""
@@ -1047,8 +1047,13 @@ type React() =
             | "add_callback" -> seq { 
                 let callbackName = op.["name"].ToObject<string>()
                 let cellName = op.["cell"].ToObject<string>() 
+                let callback = 
+                    if canonicalDataCase.Description.Contains("do not report") then 
+                        "[value]" 
+                    else 
+                        sprintf "%s @ [value]" callbackName
                 yield sprintf "let mutable %s = []" callbackName 
-                yield sprintf "let %sHandler = Handler<int>(fun _ value -> %s <- %s @ [value])" callbackName callbackName callbackName
+                yield sprintf "let %sHandler = Handler<int>(fun _ value -> %s <- %s)" callbackName callbackName callback
                 yield sprintf "%s.Changed.AddHandler %sHandler" cellName callbackName }
             | "expect_callback_values" -> seq {
                 let callbackName = op.["callback"].ToObject<string>()
@@ -1442,6 +1447,14 @@ type Wordy() =
     override __.RenderExpected (_, _, value) =
         value |> Option.ofNonFalse |> formatValue |> parenthesizeOption
 
+type Yacht() =
+    inherit GeneratorExercise()
+
+    override __.RenderInput (canonicalDataCase, key, value) =
+        match key with
+        | "category" -> sprintf "Category.%s" (value |> string |> String.dehumanize)
+        | _ -> base.RenderInput (canonicalDataCase, key, value)
+
 type ZebraPuzzle() =
     inherit GeneratorExercise()
 

data/tracks/fsharp/generators/Generators.fsproj

@@ -18,17 +18,17 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="CommandLineParser" Version="2.1.1-beta" />    
-    <PackageReference Include="DotLiquid" Version="2.0.232" />
+    <PackageReference Include="CommandLineParser" Version="2.2.1" />    
+    <PackageReference Include="DotLiquid" Version="2.0.254" />
     <PackageReference Include="Humanizer" Version="2.2.0" />
     <PackageReference Include="LibGit2Sharp.Portable" Version="0.24.10" />
-    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
     <PackageReference Include="serilog" Version="2.6.0" />
     <PackageReference Include="serilog.sinks.literate" Version="3.0.0" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Update="FSharp.Core" Version="4.2.3" />
+    <PackageReference Update="FSharp.Core" Version="4.3.4" />
   </ItemGroup>
 
 </Project>

data/tracks/fsharp/generators/Options.fs

@@ -28,7 +28,7 @@ type Options =
       CacheCanonicalData : bool }
 
 let private normalizeCanonicalDataDirectory canonicalDataDirectory = 
-    if canonicalDataDirectory <> "" then
+    if not (String.IsNullOrWhiteSpace(canonicalDataDirectory)) then
         canonicalDataDirectory
     else
         let appDataDirectory = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData)

data/tracks/haskell/exercises/bracket-push/package.yaml

@@ -1,5 +1,5 @@
 name: bracket-push
-version: 1.2.0.3
+version: 1.3.0.4
 
 dependencies:
   - base