trackler 2.2.1.54 → 2.2.1.55

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

@@ -1,18 +1,21 @@
+// This file was auto-generated based on version 1.1.0 of the canonical data.
+
 module TwoFerTest
 
-open Xunit
 open FsUnit.Xunit
+open Xunit
 
 open TwoFer
 
 [<Fact>]
 let ``No name given`` () =
-    getResponse None |> should equal "One for you, one for me."
+    name None |> should equal "One for you, one for me."
 
 [<Fact(Skip = "Remove to run test")>]
 let ``A name given`` () =
-    getResponse (Some "Alice") |> should equal "One for Alice, one for me."
+    name (Some "Alice") |> should equal "One for Alice, one for me."
 
 [<Fact(Skip = "Remove to run test")>]
 let ``Another name given`` () =
-    getResponse (Some "Bob") |> should equal "One for Bob, one for me."
+    name (Some "Bob") |> should equal "One for Bob, one for me."
+

data/tracks/fsharp/generators/Common.fs

@@ -2,7 +2,6 @@
 module Generators.Common
 
 open System
-open System.IO
 open Serilog
 open Newtonsoft.Json.Linq
 
@@ -55,7 +54,7 @@ module Option =
         match value with
         | :? int64 as i -> if i < 0L then None else Some value
         | :? int32 as i -> if i < 0  then None else Some value
-        | _ -> None
+        | _ -> Some value
 
     let ofNonFalse (value: obj) =
         match value with
@@ -67,6 +66,11 @@ module Option =
         | :? JToken as jToken when not (isNull jToken.["error"]) -> None
         | _ -> Some value
 
+    let ofNonEmptyString (value: string) =
+        match String.IsNullOrEmpty value with
+        | true  -> None
+        | false -> Some value
+
 module String =
     open Humanizer
 

data/tracks/fsharp/generators/Exercise.fs

@@ -1,14 +1,11 @@
 module Generators.Exercise
 
 open System
-open System.Globalization
-open System.Collections.Generic
 open System.IO
 open System.Reflection
 open Newtonsoft.Json.Linq
 open Humanizer
 open Serilog
-open Input
 open Output
 
 [<AbstractClass>]
@@ -16,6 +13,7 @@ type Exercise() =
     // Allow changes in canonical data
     abstract member MapCanonicalData : CanonicalData -> CanonicalData
     abstract member MapCanonicalDataCase : CanonicalDataCase -> CanonicalDataCase
+    abstract member MapCanonicalDataCaseProperties : CanonicalDataCase * Map<string, obj> -> Map<string, obj>
     abstract member MapCanonicalDataCaseProperty : CanonicalDataCase * string * obj -> obj
 
     // Convert canonical data to representation used when rendering
@@ -81,11 +79,12 @@ type Exercise() =
         { canonicalData with Cases = List.map this.MapCanonicalDataCase canonicalData.Cases }
 
     default this.MapCanonicalDataCase canonicalDataCase =
-        let updatedProperties = 
-            canonicalDataCase.Properties
-            |> Map.map (fun key value -> this.MapCanonicalDataCaseProperty (canonicalDataCase, key, value)) 
+        { canonicalDataCase with 
+            Properties = this.MapCanonicalDataCaseProperties (canonicalDataCase, canonicalDataCase.Properties) }
 
-        { canonicalDataCase with Properties = updatedProperties }
+    default this.MapCanonicalDataCaseProperties (canonicalDataCase, properties) =
+        properties
+        |> Map.map (fun key value -> this.MapCanonicalDataCaseProperty (canonicalDataCase, key, value)) 
 
     default this.MapCanonicalDataCaseProperty (canonicalDataCase, key, value) = value
 
@@ -234,17 +233,19 @@ type Exercise() =
 
     default this.AdditionalNamespaces = []
 
-let createExercises filteredExercises =
+let createExercises filteredExercise =
 
     let isConcreteExercise (exerciseType: Type) = 
         not exerciseType.IsAbstract && typeof<Exercise>.IsAssignableFrom(exerciseType)
 
-    let isFilteredExercises (exerciseType: Type) =
-        Seq.isEmpty filteredExercises ||
-        Seq.exists (String.equals exerciseType.Name) filteredExercises ||
-        Seq.exists (String.equals (exerciseType.Name.Kebaberize())) filteredExercises
+    let isFilteredExercise exercise (exerciseType: Type) =
+        String.equals exercise exerciseType.Name || 
+        String.equals exercise (exerciseType.Name.Kebaberize())
 
-    let includeExercise (exerciseType: Type) = isConcreteExercise exerciseType && isFilteredExercises exerciseType
+    let includeExercise (exerciseType: Type) = 
+        match filteredExercise with
+        | None -> isConcreteExercise exerciseType
+        | Some exercise -> isConcreteExercise exerciseType && isFilteredExercise exercise exerciseType
 
     let assemblyTypes = Assembly.GetEntryAssembly().GetTypes()
 

data/tracks/fsharp/generators/Generators.fs

@@ -2,7 +2,6 @@ module Generators.Generators
 
 open System
 open System.Globalization
-open Humanizer
 open Newtonsoft.Json.Linq
 open Output
 open Exercise
@@ -56,6 +55,34 @@ type Allergies() =
         | "substance" -> string value
         | _ -> base.RenderInput (canonicalDataCase, key, value)
 
+type Alphametics() =
+    inherit Exercise()
+
+    member this.formatMap<'TKey, 'TValue> (value: obj) =
+        if isNull value then
+            "None"
+        else
+            let input = value :?> JObject
+            let dict = input.ToObject<Collections.Generic.Dictionary<'TKey, 'TValue>>();
+            let formattedList =
+                dict
+                |> Seq.map (fun kv -> formatTuple (kv.Key, kv.Value))
+                |> formatMultiLineList
+
+            if (formattedList.Contains("\n")) then
+                sprintf "%s\n%s\n%s" formattedList (indent 2 "|> Map.ofList") (indent 2 "|> Some")
+            else   
+                sprintf "%s |> Map.ofList |> Some" formattedList
+
+    override this.RenderExpected (canonicalDataCase, key, value) = this.formatMap<char, int> value
+
+    override this.PropertiesWithIdentifier canonicalDataCase = this.Properties canonicalDataCase
+
+type Anagram() =
+    inherit Exercise()
+
+    override this.PropertiesWithIdentifier canonicalDataCase = ["candidates"]
+
 type BeerSong() =
     inherit Exercise()
 
@@ -134,6 +161,25 @@ type Clock() =
         | _ -> 
             base.RenderSut canonicalDataCase
 
+type Connect() =
+    inherit Exercise()
+
+    override this.RenderExpected (canonicalDataCase, key, value) =
+        match string value with
+        | "O" -> "(Some White)"
+        | "X" -> "(Some Black)"
+        | _   -> "None"
+
+    override this.RenderInput (canonicalDataCase, key, value) =
+        let lines = (value :?> JArray).ToObject<string seq>() |> List.ofSeq
+        let padSize = List.last lines |> String.length
+
+        lines        
+        |> List.map (fun line -> line.PadRight(padSize) |> formatValue)
+        |> formatMultiLineList
+
+    override this.PropertiesWithIdentifier canonicalDataCase = this.PropertiesUsedAsSutParameter canonicalDataCase
+
 type CryptoSquare() =
     inherit Exercise()
 
@@ -155,6 +201,29 @@ type Dominoes() =
 
     override this.PropertiesWithIdentifier canonicalDataCase = this.PropertiesUsedAsSutParameter canonicalDataCase
 
+type FoodChain() =
+    inherit Exercise()
+
+    let hasMultipleVerses canonicalDataCase = Map.containsKey "end verse" canonicalDataCase.Properties
+
+    override this.RenderSutProperty canonicalDataCase = 
+        match hasMultipleVerses canonicalDataCase with
+        | true  -> "verses"
+        | false -> "verse"
+
+    override this.PropertiesUsedAsSutParameter canonicalDataCase =
+        match hasMultipleVerses canonicalDataCase with
+        | true  -> ["start verse"; "end verse"]
+        | false -> ["start verse"]
+
+    override this.PropertiesWithIdentifier canonicalDataCase = ["expected"]
+
+    override this.RenderExpected (canonicalDataCase, key, value) =
+        (value :?> JArray)
+        |> normalizeJArray
+        |> Seq.map formatValue
+        |> formatMultiLineList
+
 type Gigasecond() =
     inherit Exercise()
 
@@ -179,9 +248,34 @@ type Grains() =
         | "-1" -> "Error \"Invalid input\""
         | x    -> sprintf "Ok %sUL" x
 
+type Hamming() =
+    inherit Exercise()
+
+    override this.RenderExpected (canonicalDataCase, key, value) = 
+        value 
+        |> Option.ofNonError 
+        |> formatValue
+        |> parenthesizeOption
+
 type HelloWorld() =
     inherit Exercise()
 
+type House() =
+    inherit Exercise()
+
+    override this.PropertiesUsedAsSutParameter canonicalDataCase =
+        match canonicalDataCase.Property with
+        | "verses"  -> ["start verse"; "end verse"]
+        | _         -> base.PropertiesUsedAsSutParameter canonicalDataCase
+
+    override this.PropertiesWithIdentifier canonicalDataCase = ["expected"]
+
+    override this.RenderExpected (canonicalDataCase, key, value) =
+        (value :?> JArray)
+        |> normalizeJArray
+        |> Seq.map formatValue
+        |> formatMultiLineList
+
 type Isogram() =
     inherit Exercise()
 
@@ -215,6 +309,32 @@ type Leap() =
 
 type Luhn() =
     inherit Exercise()
+    
+type Meetup() =
+    inherit Exercise()
+
+    override this.RenderExpected (canonicalDataCase, key, value) =
+        let year  = canonicalDataCase.Properties.["year"] :?> int64 |> int
+        let month = canonicalDataCase.Properties.["month"] :?> int64 |> int
+        let day   = canonicalDataCase.Properties.["dayofmonth"] :?> int64 |> int
+        DateTime(year, month, day) |> formatDateTime |> parenthesize
+
+    override this.RenderInput (canonicalDataCase, key, value) =
+        match key with
+        | "dayofweek" -> 
+            sprintf "DayOfWeek.%s" (string canonicalDataCase.Properties.["dayofweek"])
+        | "week" -> 
+            sprintf "Schedule.%s" (string canonicalDataCase.Properties.["week"] |> String.upperCaseFirst)
+        | _ -> 
+            base.RenderInput (canonicalDataCase, key, value)
+
+    override this.MapCanonicalDataCaseProperties (canonicalDataCase, properties) =
+        properties |> Map.add "expected" null // Ensure that the "expected" key exists
+
+    override this.PropertiesUsedAsSutParameter canonicalDataCase = 
+        ["year"; "month"; "dayofweek"; "week"]
+
+    override this.AdditionalNamespaces = [typeof<DateTime>.Namespace]
 
 type Minesweeper() =
     inherit Exercise()
@@ -241,6 +361,23 @@ type NthPrime() =
         |> formatValue 
         |> parenthesizeOption
 
+type OcrNumbers() =
+    inherit Exercise()
+
+    override this.PropertiesWithIdentifier canonicalDataCase = this.PropertiesUsedAsSutParameter canonicalDataCase
+
+    override this.RenderExpected (canonicalDataCase, key, value) = 
+        value 
+        |> Option.ofNonNegativeInt 
+        |> formatValue 
+        |> parenthesizeOption
+
+    override this.RenderInput (canonicalDataCase, key, value) =
+        value :?> JArray
+        |> normalizeJArray
+        |> Seq.map formatValue
+        |> formatMultiLineList
+
 type Pangram() =
     inherit Exercise()
     
@@ -471,4 +608,10 @@ type RomanNumerals() =
     inherit Exercise()
 
 type ScrabbleScore() =
-    inherit Exercise()
+    inherit Exercise()
+
+type TwoFer() =
+    inherit Exercise()
+
+    override this.RenderInput (canonicalDataCase, key, value) =
+        value |> Option.ofObj |> formatValue |> parenthesizeOption

data/tracks/fsharp/generators/Options.fs

@@ -3,15 +3,13 @@ module Generators.Options
 open System
 open System.IO
 open CommandLine
-open Serilog
-open Humanizer
 
 type Options = {
-  [<CommandLine.Option('e', "exercises", Required = false, 
-    HelpText = "Exercises to generate (if not specified, defaults to all exercises).")>] Exercises : seq<string>;
-  [<CommandLine.Option('d', "canonicaldatadirectory", Required = false, 
+  [<Option('e', "exercise", Required = false, 
+    HelpText = "Exercise to generate (if not specified, defaults to all exercises).")>] Exercise : string;
+  [<Option('d', "canonicaldatadirectory", Required = false, 
     HelpText = "Canonical data directory. If the directory does not exist, the canonical data will be downloaded.")>] CanonicalDataDirectory : string;
-  [<CommandLine.Option('s', "skipupdatecanonicaldata", Required = false,
+  [<Option('s', "skipupdatecanonicaldata", Required = false,
     HelpText = "Don't update the canonical data.")>] SkipUpdateCanonicalData : bool;
 }
 

data/tracks/fsharp/generators/Output.fs

@@ -149,11 +149,11 @@ let formatMultiLineCollection (openPrefix, closePostfix) collection =
         let formatLine i line = 
             match i with
             | 0 -> 
-                sprintf "%s %s" openPrefix line
+                sprintf "%s %s;" openPrefix line
             | _ when i = length - 1 -> 
                 sprintf "%s %s %s" lineIndent line closePostfix
             | _ ->
-                sprintf "%s %s" lineIndent line
+                sprintf "%s %s;" lineIndent line
 
         collection
         |> Seq.mapi formatLine

data/tracks/fsharp/generators/Program.fs

@@ -16,8 +16,9 @@ let regenerateTestClasses options =
     Log.Information("Re-generating test classes...")
 
     let regenerateTestClass' = regenerateTestClass options
+    let filteredExercise = Option.ofNonEmptyString options.Exercise
 
-    createExercises options.Exercises
+    createExercises filteredExercise
     |> Seq.iter regenerateTestClass'
 
     Log.Information("Re-generated test classes.")
@@ -27,9 +28,9 @@ let main argv =
     Logging.setupLogger()
 
     match parseOptions argv with
-    | Result.Ok(options) -> 
+    | Ok(options) -> 
         regenerateTestClasses options
         0
-    | Result.Error(errors) -> 
+    | Error(errors) -> 
         Log.Error("Error(s) parsing commandline arguments: {Errors}", errors)
         1

data/tracks/java/exercises/saddle-points/README.md

@@ -15,7 +15,7 @@ So say you have a matrix like so:
 It has a saddle point at (1, 0).
 
 It's called a "saddle point" because it is greater than or equal to
-every element in its row and the less than or equal to every element in
+every element in its row and less than or equal to every element in
 its column.
 
 A matrix may have zero or more saddle points.

data/tracks/java/exercises/two-fer/README.md

@@ -11,34 +11,6 @@ When X is a name or "you".
 If the given name is "Alice", the result should be "One for Alice, one for me."
 If no name is given, the result should be "One for you, one for me."
 
-## Test-Driven Development
-
-As programmers mature, they eventually want to test their code.
-
-Here at Exercism we simulate [Test-Driven
-Development](http://en.wikipedia.org/wiki/Test-driven_development) (TDD), where
-you write your tests before writing any functionality. The simulation comes in
-the form of a pre-written test suite, which will signal that you have solved
-the problem.
-
-It will also provide you with a safety net to explore other solutions without
-breaking the functionality.
-
-### A typical TDD workflow on Exercism:
-
-1. Run the test file and pick one test that's failing.
-2. Write some code to fix the test you picked.
-3. Re-run the tests to confirm the test is now passing.
-4. Repeat from step 1.
-5. Submit your solution (`exercism submit /path/to/file`)
-
-## Instructions
-
-Submissions are encouraged to be general, within reason. Having said that, it's
-also important not to over-engineer a solution.
-
-It's important to remember that the goal is to make code as expressive and
-readable as we can.
 
 # Java Tips
 

data/tracks/javascript/exercises/beer-song/example.js

@@ -15,39 +15,43 @@
     return str;
   }
 
-  function action(current_verse) {
-    var sbj, str = '';
+  function action(currentVerse) {
+    var sbj;
+    var str = '';
 
-    if (current_verse === 0) {
+    if (currentVerse === 0) {
       str = 'Go to the store and buy some more, ';
     } else {
-      sbj = (current_verse === 1 ? 'it' : 'one');
+      sbj = (currentVerse === 1 ? 'it' : 'one');
       str = 'Take ' + sbj + ' down and pass it around, ';
     }
 
     return str;
   }
 
-  function next_bottle(current_verse) {
-    return bottles(next_verse(current_verse)).toLowerCase() + ' of beer on the wall.\n';
+  function nextBottle(currentVerse) {
+    return bottles(nextVerse(currentVerse)).toLowerCase() + ' of beer on the wall.\n';
   }
 
-  function next_verse(current_verse) {
-    return current_verse === 0 ? 99 : (current_verse - 1);
+  function nextVerse(currentVerse) {
+    return currentVerse === 0 ? 99 : (currentVerse - 1);
   }
 
   function BeerSong() {}
 
   BeerSong.prototype.sing = function (first, last) {
-    if (typeof (first) === 'undefined') {
-      first = 99;
+    var firstVerseBottleCount = first;
+    var lastVerseBottleCount = last;
+
+    if (typeof (firstVerseBottleCount) === 'undefined') {
+      firstVerseBottleCount = 99;
     }
-    if (typeof (last) === 'undefined') {
-      last = 0;
+    if (typeof (lastVerseBottleCount) === 'undefined') {
+      lastVerseBottleCount = 0;
     }
 
     var verses = [];
-    for (var i = first; i >= last; i--) {
+    for (var i = firstVerseBottleCount; i >= lastVerseBottleCount; i--) {
       verses.push(this.verse(i));
     }
 
@@ -58,7 +62,7 @@
     var line1 = bottles(number) + ' of beer on the wall, ';
     var line2 = bottles(number).toLowerCase() + ' of beer.\n';
     var line3 = action(number);
-    var line4 = next_bottle(number);
+    var line4 = nextBottle(number);
 
     return [line1, line2, line3, line4].join('');
   };