trackler 2.1.0.12 → 2.1.0.13

data/tracks/ocaml/exercises/all-your-base/test.ml

@@ -1,3 +1,5 @@
+(* Test/exercise version: "1.0.0" *)
+
 open Core.Std
 open OUnit2
 open All_your_base

data/tracks/ocaml/exercises/anagram/test.ml

@@ -1,3 +1,5 @@
+(* Test/exercise version: "1.0.1" *)
+
 open Core.Std
 open OUnit2
 open Anagram

data/tracks/ocaml/exercises/atbash-cipher/test.ml

@@ -1,3 +1,5 @@
+(* Test/exercise version: "1.0.0" *)
+
 open Core.Std
 open OUnit2
 open Atbash_cipher
@@ -23,6 +25,7 @@ let encode_tests = [
      ae "gsvjf rxpyi ldmul cqfnk hlevi gsvoz abwlt" (encode "The quick brown fox jumps over the lazy dog.");
 ]
 
+
 let decode_tests = [
    "decode exercism" >::
      ae "exercism" (decode "vcvix rhn");

data/tracks/ocaml/exercises/beer-song/test.ml

@@ -1,3 +1,5 @@
+(* Test/exercise version: "1.0.0" *)
+
 open Core.Std
 open OUnit2
 open Beer_song

data/tracks/ocaml/exercises/binary-search/.merlin

@@ -0,0 +1,5 @@
+PKG findlib
+PKG core
+PKG ounit
+S *
+B *

data/tracks/ocaml/exercises/binary-search/Makefile

@@ -0,0 +1,11 @@
+test: test.native
+	@./test.native
+
+test.native: *.ml *.ml
+	@corebuild -r -quiet -pkg oUnit test.native
+
+clean:
+	rm -rf _build
+	rm -f test.native
+
+.PHONY: clean

data/tracks/ocaml/exercises/binary-search/binary_search.mli

@@ -0,0 +1,2 @@
+(* Finds an int in an array of ints via binary search *)
+val find : int array -> int -> int option

data/tracks/ocaml/exercises/binary-search/example.ml

@@ -0,0 +1,19 @@
+open Core.Std
+
+let find array value = 
+  let rec go lo hi = 
+    if lo > hi then None
+    else begin 
+      let mid = lo + (hi - lo) / 2 in
+      let mid_val = array.(mid) in
+      if mid_val < value
+      then go (mid + 1) hi
+      else if mid_val > value
+      then go lo (mid - 1)
+      else Some mid
+    end
+  in
+  if Array.is_empty array
+  then None
+  else go 0 (Array.length array - 1) 
+  

data/tracks/ocaml/exercises/binary-search/test.ml

@@ -0,0 +1,38 @@
+(* Test/exercise version: "1.0.0" *)
+
+open Core.Std
+open OUnit2
+open Binary_search
+
+let option_to_string f = function
+  | None   -> "None"
+  | Some x -> "Some " ^ f x
+
+let ae exp got _test_ctxt =
+  assert_equal ~printer:(option_to_string Int.to_string) exp got
+
+let tests = [
+  "finds a value in an array with one element" >::
+    ae (Some 0) (find [|6|] 6);
+  "finds a value in the middle of an array" >::
+    ae (Some 3) (find [|1; 3; 4; 6; 8; 9; 11|] 6);
+  "finds a value at the beginning of an array" >::
+    ae (Some 0) (find [|1; 3; 4; 6; 8; 9; 11|] 1);
+  "finds a value at the end of an array" >::
+    ae (Some 6) (find [|1; 3; 4; 6; 8; 9; 11|] 11);
+  "finds a value in an array of odd length" >::
+    ae (Some 9) (find [|1; 3; 5; 8; 13; 21; 34; 55; 89; 144; 233; 377; 634|] 144);
+  "finds a value in an array of even length" >::
+    ae (Some 5) (find [|1; 3; 5; 8; 13; 21; 34; 55; 89; 144; 233; 377|] 21);
+  "identifies that a value is not included in the array" >::
+    ae None (find [|1; 3; 4; 6; 8; 9; 11|] 7);
+  "a value smaller than the array's smallest value is not included" >::
+    ae None (find [|1; 3; 4; 6; 8; 9; 11|] 0);
+  "a value larger than the array's largest value is not included" >::
+    ae None (find [|1; 3; 4; 6; 8; 9; 11|] 13);
+  "nothing is included in an empty array" >::
+    ae None (find [||] 1);
+]
+
+let () =
+  run_test_tt_main ("binary-search tests" >::: tests)

data/tracks/ocaml/exercises/bob/test.ml

@@ -1,3 +1,5 @@
+(* Test/exercise version: "1.0.0" *)
+
 open Core.Std
 open OUnit2
 open Bob

data/tracks/ocaml/exercises/bowling/test.ml

@@ -1,3 +1,5 @@
+(* Test/exercise version: "1.0.0" *)
+
 open! Core.Std
 open OUnit2
 open Bowling

data/tracks/ocaml/exercises/bracket-push/test.ml

@@ -1,3 +1,5 @@
+(* Test/exercise version: "1.1.0" *)
+
 open Core.Std
 open OUnit2
 open Bracket_push

data/tracks/ocaml/exercises/change/test.ml

@@ -1,3 +1,5 @@
+(* Test/exercise version: "1.0.0" *)
+
 open Core.Std
 open OUnit2
 open Change

data/tracks/ocaml/exercises/connect/test.ml

@@ -1,3 +1,5 @@
+(* Test/exercise version: "1.0.0" *)
+
 open Core.Std
 open OUnit2
 open Connect

data/tracks/ocaml/exercises/difference-of-squares/test.ml

@@ -1,3 +1,5 @@
+(* Test/exercise version: "1.1.0" *)
+
 open Core.Std
 open OUnit2
 open Difference_of_squares
@@ -5,30 +7,30 @@ open Difference_of_squares
 let ae exp got _test_ctxt = assert_equal exp got
 
 let square_of_sum_tests = [
+   "square of sum 1" >::
+     ae 1 (square_of_sum 1);
    "square of sum 5" >::
      ae 225 (square_of_sum 5);
-   "square of sum 10" >::
-     ae 3025 (square_of_sum 10);
    "square of sum 100" >::
      ae 25502500 (square_of_sum 100);
 ]
 
+
 let sum_of_squares_tests = [
+   "sum of squares 1" >::
+     ae 1 (sum_of_squares 1);
    "sum of squares 5" >::
      ae 55 (sum_of_squares 5);
-   "sum of squares 10" >::
-     ae 385 (sum_of_squares 10);
    "sum of squares 100" >::
      ae 338350 (sum_of_squares 100);
 ]
 
+
 let difference_of_squares_tests = [
-   "difference of squares 0" >::
-     ae 0 (difference_of_squares 0);
+   "difference of squares 1" >::
+     ae 0 (difference_of_squares 1);
    "difference of squares 5" >::
      ae 170 (difference_of_squares 5);
-   "difference of squares 10" >::
-     ae 2640 (difference_of_squares 10);
    "difference of squares 100" >::
      ae 25164150 (difference_of_squares 100);
 ]

data/tracks/ocaml/exercises/dominoes/test.ml

@@ -1,3 +1,5 @@
+(* Test/exercise version: "1.0.1" *)
+
 open Core.Std
 open OUnit2
 open Dominoes

data/tracks/ocaml/exercises/etl/test.ml

@@ -1,3 +1,5 @@
+(* Test/exercise version: "1.0.0" *)
+
 open Core.Std
 open OUnit2
 open Etl

data/tracks/ocaml/exercises/hamming/test.ml

@@ -1,3 +1,5 @@
+(* Test/exercise version: "1.0.0" *)
+
 open Core.Std
 open OUnit2
 

data/tracks/ocaml/exercises/hello-world/test.ml

@@ -1,3 +1,5 @@
+(* Test/exercise version: "1.0.0" *)
+
 open Core.Std
 open OUnit2
 open Hello_world

data/tracks/ocaml/exercises/leap/test.ml

@@ -1,3 +1,5 @@
+(* Test/exercise version: "1.0.0" *)
+
 open Core.Std
 open OUnit2
 open Leap

data/tracks/ocaml/exercises/luhn/test.ml

@@ -1,3 +1,5 @@
+(* Test/exercise version: "1.0.0" *)
+
 open Core.Std
 open OUnit2
 open Luhn

data/tracks/ocaml/exercises/minesweeper/test.ml

@@ -1,3 +1,5 @@
+(* Test/exercise version: "1.0.0" *)
+
 open Core.Std
 open OUnit2
 open Minesweeper

data/tracks/ocaml/exercises/pangram/test.ml

@@ -1,3 +1,5 @@
+(* Test/exercise version: "1.0.0" *)
+
 open Core.Std
 open OUnit2
 open Pangram

data/tracks/ocaml/exercises/phone-number/test.ml

@@ -1,3 +1,5 @@
+(* Test/exercise version: "1.2.0" *)
+
 open Core.Std
 open OUnit2
 open Phone_number

data/tracks/ocaml/exercises/prime-factors/test.ml

@@ -1,3 +1,5 @@
+(* Test/exercise version: "1.0.0" *)
+
 open Core.Std
 open OUnit2
 open Prime_factors

data/tracks/ocaml/exercises/raindrops/test.ml

@@ -1,3 +1,5 @@
+(* Test/exercise version: "1.0.0" *)
+
 open Core.Std
 open OUnit2
 open Raindrops

data/tracks/ocaml/exercises/roman-numerals/test.ml

@@ -1,3 +1,5 @@
+(* Test/exercise version: "1.0.0" *)
+
 open Core.Std
 open OUnit2
 open Roman_numerals

data/tracks/ocaml/exercises/run-length-encoding/test.ml

@@ -1,3 +1,5 @@
+(* Test/exercise version: "1.0.0" *)
+
 open Core.Std
 open OUnit2
 open Run_length_encoding

data/tracks/ocaml/exercises/say/test.ml

@@ -1,3 +1,5 @@
+(* Test/exercise version: "1.0.0" *)
+
 open Core.Std
 open OUnit2
 open Say

data/tracks/ocaml/exercises/space-age/test.ml

@@ -1,3 +1,5 @@
+(* Test/exercise version: "1.0.0" *)
+
 open Core.Std
 open OUnit2
 open Space_age

data/tracks/ocaml/exercises/triangle/test.ml

@@ -1,3 +1,5 @@
+(* Test/exercise version: "1.0.0" *)
+
 open Core.Std
 open OUnit2
 open Triangle

data/tracks/ocaml/exercises/word-count/test.ml

@@ -1,3 +1,5 @@
+(* Test/exercise version: "1.0.0" *)
+
 open Core.Std
 open OUnit2
 open Word_count

data/tracks/ocaml/tools/test-generator/src/controller.ml

@@ -27,11 +27,16 @@ let combine_files (template_files: (string * content) list) (canonical_data_file
 
 (* pangram in the canonical data is a suite but it does not really need to be as there's only one group. Convert a Suite to
    a Single test in this case, to simplify the template. *)
-let simplify_single_test_suite (tests: tests): tests = match tests with
-| Suite [{name = name; cases = cases}] -> Single cases
-| x -> x
+let simplify_single_test_suite (canonical_data: canonical_data): canonical_data = match canonical_data.tests with
+| Suite [{name = name; cases = cases}] -> {version=canonical_data.version; tests=Single cases}
+| _ -> canonical_data
 
-let generate_code ~(slug: string) ~(template_file: content) ~(canonical_data_file: content): (content, content) Result.t =
+
+let prepend_version (v: string option) (str: string): string = match v with
+| None -> str
+| Some v -> "(* Test/exercise version: \"" ^ v ^ "\" *)\n\n" ^ str
+
+let generate_code ~(slug: string) ~(template_file: content) ~(canonical_data_file: content): (content, string) Result.t =
   let open Result.Monad_infix in
   Result.of_option ~error:("cannot recognize file for " ^ slug ^ " as a template") @@ find_template template_file >>= fun template ->
   let edit_expected = edit_expected ~stringify:json_to_string ~slug in
@@ -40,11 +45,12 @@ let generate_code ~(slug: string) ~(template_file: content) ~(canonical_data_fil
   let file_text = template.file_text in
   let file_lines = String.split_lines file_text |> List.to_array in
   parse_json_text canonical_data_file (expected_key_name slug) (cases_name slug)
-  |> Result.map_error ~f:show_error >>| simplify_single_test_suite >>= (function
+  |> Result.map_error ~f:show_error >>| simplify_single_test_suite >>= fun cd -> (match cd.tests with
       | Single cases ->
         let template = to_single template.template in
         fill_in_template template.template slug cases
         |> fill_tests file_text template
+        |> prepend_version cd.version
         |> Result.return
       | Suite tests ->
         let suites = to_multi template.template in
@@ -56,6 +62,7 @@ let generate_code ~(slug: string) ~(template_file: content) ~(canonical_data_fil
         in
         List.map tests ~f:fill_suite_tests |> sequence >>=
         fill_suite template
+        |> Result.map ~f:(prepend_version cd.version)
     )
 
 let output_tests (files: (string * content * content) list) (output_folder: string) ~(generated_folder: string): unit =
@@ -69,6 +76,9 @@ let output_tests (files: (string * content * content) list) (output_folder: stri
     | Error e -> print_endline ("Failed when generating " ^ slug ^ ", error: " ^ e) in
   List.iter files ~f:output1
 
+(*let add_header (canonical_data_folder: string) (generated: string): string =*)
+
+
 let run ~(templates_folder: string) ~(canonical_data_folder: string) ~(output_folder: string) ~(generated_folder: string) (filter: string option) =
   let template_files = find_template_files templates_folder filter in
   let canonical_data_files = find_canonical_data_files canonical_data_folder in

data/tracks/ocaml/tools/test-generator/src/model.ml

@@ -15,6 +15,11 @@ type tests =
   | Single of case list
   | Suite of test list
 
+type canonical_data = {
+  version: string option;
+  tests: tests
+}
+
 let rec json_to_string (j: json): string = match j with
   | `Null -> "null"
   | `String s -> "\"" ^ (String.escaped s) ^ "\""

data/tracks/ocaml/tools/test-generator/src/parser.ml

@@ -69,13 +69,14 @@ let parse_cases_from_suite name suite expected_key cases_key =
   to_list_note ExpectingListOfCases >>= fun tests ->
   List.map tests ~f:(parse_case expected_key) |> sequence
 
-let parse_json_text (text: string) (expected_key: string) (cases_key: string): (tests, error) Result.t =
+let parse_json_text (text: string) (expected_key: string) (cases_key: string): (canonical_data, error) Result.t =
   let open Result.Monad_infix in
   let json = from_string text in
+  let version = member "version" json |> to_string_option in
   match suite_cases json cases_key with
-  | Ok suite_cases -> Ok (Suite suite_cases)
-  | Error _ -> parse_single text expected_key cases_key
-
+  | Ok suite_cases -> Ok {version; tests=(Suite suite_cases)}
+  | Error _ -> parse_single text expected_key cases_key >>= fun tests -> Ok {version; tests}
+                
 let show_error = function
   | TestMustHaveKeyCalledCases name -> "Test named '" ^ name ^ "' is expected to have an object with a key: 'cases'"
   | ExpectingMapForCase -> "Expected a json map for a test case"

data/tracks/ocaml/tools/test-generator/src/special_cases.ml

@@ -67,6 +67,7 @@ let edit_expected ~(stringify: json -> string) ~(slug: string) ~(value: json) =
 | "connect" -> edit_connect_expected value
 | "change" -> edit_change_expected value
 | "bowling" -> edit_bowling_expected value
+| "binary-search" -> optional_int ~none:(-1) value
 | _ -> stringify value
 
 let edit_say (ps: (string * json) list) =
@@ -106,6 +107,16 @@ let edit_bowling (ps: (string * json) list): (string * string) list =
   | (k, v) -> (k, json_to_string v) in
   List.map ps ~f:edit
 
+let edit_binary_search (ps: (string * json) list): (string * string) list =
+  let open Yojson.Basic.Util in
+  let as_array_string xs = 
+    let xs = to_list xs |> List.map ~f:to_int |> List.map ~f:Int.to_string in
+    "[|" ^ String.concat ~sep:"; " xs ^ "|]" in
+  let edit = function
+  | ("array", v) -> ("array", as_array_string v) 
+  | (k, v) -> (k, json_to_string v) in
+  List.map ps ~f:edit
+
 let edit_parameters ~(slug: string) (parameters: (string * json) list) = match (slug, parameters) with
 | ("hello-world", ps) -> default_value ~key:"name" ~value:"None" (optional_strings ~f:(fun _x -> true) parameters)
 | ("say", ps) -> edit_say ps
@@ -113,6 +124,7 @@ let edit_parameters ~(slug: string) (parameters: (string * json) list) = match (
 | ("dominoes", ps) -> edit_dominoes ps
 | ("space-age", ps) -> edit_space_age ps
 | ("bowling", ps) -> edit_bowling ps
+| ("binary-search", ps) -> edit_binary_search ps
 | (_, ps) -> map_elements json_to_string ps
 
 let expected_key_name slug = match slug with