trackler 2.0.8.22 → 2.0.8.23

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

@@ -4,64 +4,114 @@ open Codegen
 open Utils
 
 (* start and finish are the lines where the generated code should be copied *)
-type t = {start: int;
-          finish: int;
-          file_text: string;
-          template: string;
-          suite_name_line: int option;
-          suite_end: int option;
-          suite_all_names_line: int option;
+type template_part = {
+  start: int;
+  finish: int;
+  template: string;
+} [@@deriving eq, show]
+
+type suite = {
+  template_part: template_part;
+  suite_name_line: int;
+  suite_end: int;
+} [@@deriving eq, show]
+
+type template = 
+  Single of template_part
+| Multi of (suite list) [@@deriving eq, show]
+
+type t = {file_text: string;
+          template: template;
          } [@@deriving eq, show]
 
 let find_template ~(template_text: string): t option =
   let open Option.Monad_infix in
-  let str_contains pattern s = String.substr_index s ~pattern |> Option.is_some in
   let lines = String.split_lines template_text |> List.to_array in
-  let suite_end = find_arrayi lines ~f:(str_contains "(* END SUITE *)") |> Option.map ~f:fst in
-  let start_index = find_arrayi lines ~f:(str_contains "(* TEST") |> Option.map ~f:fst in
-  let finish_index = (start_index >>= (fun start -> find_arrayi ~start lines ~f:(str_contains "END TEST *"))) |> Option.map ~f:fst in
-  let template_lines = Option.map2 start_index finish_index (fun s -> Array.slice lines (s+1)) in
-  let suite_name_line = find_arrayi lines ~f:(str_contains "(* SUITE *)$(suite_name)") |> Option.map ~f:fst in
-  let suite_all_names_line = find_arrayi lines ~f:(str_contains "(* suite-all-names *)") |> Option.map ~f:fst in
-  Option.map2 start_index template_lines ~f:(fun s l -> {start=s;
-                                                         finish=(s + 1 + Array.length l);
-                                                         file_text = template_text;
-                                                         template=String.concat_array l ~sep:"\n";
-                                                         suite_name_line = suite_name_line;
-                                                         suite_end = suite_end;
-                                                         suite_all_names_line = suite_all_names_line
-                                                        })
+  let test_starts = Array.filter_mapi lines ~f:(fun i l -> if (String.is_substring l ~substring:"(* TEST") then Some i else None) in
+  let test_ends = Array.filter_mapi lines ~f:(fun i l -> if (String.is_substring l ~substring:"END TEST") then Some i else None) in
+  let test_starts_and_ends = Array.zip_exn test_starts test_ends in
+  let template_lines = Array.map test_starts_and_ends ~f:(fun (s,e) -> Array.slice lines (s+1) e) in
+  let suite_name_lines = Array.filter_mapi lines ~f:(fun i l -> if (String.is_prefix l ~prefix:"let (* SUITE ") then Some i else None) in
+  let suite_ends = Array.filter_mapi lines ~f:(fun i l -> if (String.is_prefix l ~prefix:"(* END SUITE *)") then Some i else None) in
+  if Array.is_empty suite_name_lines || Array.is_empty suite_ends
+  then
+    if Array.is_empty test_starts || Array.is_empty test_ends
+    then None
+    else
+    Some {
+      file_text = template_text;
+      template = Single {start = test_starts.(0); finish = test_ends.(0); template = String.concat_array ~sep:"\n" (template_lines.(0))}
+    }
+  else
+    let suites = Array.mapi suite_name_lines ~f:(fun i sn -> {
+      template_part =
+      {
+        start = test_starts.(i); 
+        finish = test_ends.(i);
+        template = template_lines.(i) |> String.concat_array ~sep:"\n";
+      };
+      suite_name_line = suite_name_lines.(i);
+      suite_end =suite_ends.(i);
+    }) |> Array.to_list in
+    Some {
+      file_text = template_text;
+      template = Multi suites
+    }
 
-let fill_tests (template: t) (substs: subst list): string =
-  let lines = String.split_lines template.file_text |> List.to_array in
+let fill_tests (file_text: string) (template: template_part) (substs: subst list): string =
+  let lines = String.split_lines file_text |> List.to_array in
   let before = Array.slice lines 0 template.start in
   let subst = Array.of_list (List.map ~f:subst_to_string substs) in
   let after = Array.slice lines (template.finish + 1) (Array.length lines) in
   let join = String.concat_array ~sep:"\n" in
   String.concat [join before; join subst; join after] ~sep:"\n"
 
-let fill_single_suite (template: t) (suite_substs: string * subst list): (string, string) Result.t =
+let array_drop n xs =
+  Array.slice xs n (Array.length xs)
+
+let list_drop_right n xs =
+  List.slice xs 0 (List.length xs - n)
+
+let fill_single_suite (file_lines: string array) (suite: suite) (suite_substs: string * subst list): (string, string) Result.t =
   let open Result.Monad_infix in
   let (suite_name, substs) = suite_substs in
-  Result.of_option template.suite_name_line ~error:"no suite name" >>= fun suite_name_line ->
-  Result.of_option template.suite_end ~error:"no suite end" >>= fun suite_end_line ->
-  let lines = String.split_lines template.file_text |> Fn.flip List.drop suite_name_line |> List.to_array in
-  Array.replace lines 0 ~f:(String.substr_replace_all ~pattern:"(* SUITE *)$(suite_name)_tests" ~with_:(suite_name ^ "_tests"));
-  let before = Array.slice lines 0 (template.start - suite_name_line) in
+  let suite_name_line = suite.suite_name_line in
+  let suite_end = suite.suite_end in
+  let lines = array_drop suite_name_line file_lines in
+  Array.replace lines 0 ~f:(String.substr_replace_all ~pattern:("(* SUITE " ^ suite_name ^ " *)") ~with_:"");
+  let before = Array.slice lines 0 (suite.template_part.start - suite_name_line) in
   let subst = Array.of_list (List.map ~f:subst_to_string substs) in
-  let after = Array.slice lines (template.finish - suite_name_line + 1) (suite_end_line - suite_name_line) in
+  let after = Array.slice lines (suite.template_part.finish - suite_name_line + 1) (suite_end - suite_name_line) in
   let join = String.concat_array ~sep:"\n" in
   Result.return @@ (String.concat [join before; join subst; join after] ~sep:"\n") ^ "\n"
 
+let matches_suite_name file_lines suite suite_name =
+  let line = file_lines.(suite.suite_name_line) in
+  String.is_substring line ~substring:suite_name
+
+let to_single = function
+| (Single s) -> s
+| _ -> failwith "bug"
+
+let to_multi = function
+| Multi suites -> suites
+| _ -> failwith "unexpected case"   
+
 let fill_suite (template: t) (suite_substs: (string * subst list) list): (string, string) Result.t =
+  let file_lines = String.split_lines template.file_text |> List.to_array in
   let open Result.Monad_infix in
-  List.map suite_substs ~f:(fun x -> (fill_single_suite template x)) |> sequence >>= fun fills ->
-  Result.of_option template.suite_name_line "no suite name line" >>= fun suite_name_line ->
-  let lines = String.split_lines template.file_text |> List.to_array in
-  let before = Array.slice lines 0 suite_name_line in
-  let subst = Array.of_list fills in
-  let after = Array.slice lines (template.finish + 4) (Array.length lines) in
-  let join = String.concat_array ~sep:"\n" in
-  let generated = String.concat [join before; join subst; join after] ~sep:"\n" in
-  let all_suite_names = String.concat ~sep:"; " @@ List.map ~f:(fun (s,_) -> s ^ "_tests") suite_substs in
-  Result.return @@ String.substr_replace_all generated ~pattern:"(* suite-all-names *)" ~with_:all_suite_names
+  let suites = to_multi template.template in
+  let fill_1_suite text (line, suite): (string, string) Result.t =
+    let suite_subst = List.find_exn suite_substs ~f:(fun (suite_name,_) -> matches_suite_name file_lines suite suite_name) in
+    fill_single_suite file_lines suite suite_subst >>= fun subst ->
+    let suite_name_line = suite.suite_name_line in
+    let before = Array.slice file_lines line suite_name_line |> String.concat_array ~sep:"\n" in
+    let generated = before ^ "\n" ^ subst in
+    Ok generated
+  in 
+  let lines = List.rev_map suites ~f:(fun s -> 1 + s.suite_end) |> List.tl_exn |> List.rev |> List.cons 0 in
+  let lines_and_suites = List.zip_exn lines suites in
+  List.map lines_and_suites ~f:(fill_1_suite template.file_text) |> sequence |> Result.map ~f:(String.concat ~sep:"\n") >>= fun all_but_last_part ->
+  let last_suite_line = (List.last_exn suites).suite_end + 1 in
+  let last_part = Array.slice file_lines last_suite_line (Array.length file_lines) |> String.concat_array ~sep:"\n" in
+  Ok (all_but_last_part ^ last_part)

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

@@ -21,8 +21,9 @@ let command =
       +> flag "-c" (optional_with_default "../../../x-common/exercises" is_directory) ~doc:"string Directory containing canonical data."
       +> flag "-o" (optional_with_default "../../exercises" is_directory) ~doc:"string Directory to output generated tests."
       +> flag "-g" (optional_with_default (home_dir ^ "/.xocaml-generated") is_directory) ~doc:"string Directory to backup generated tests."
+      +> flag "-f" (optional string) ~doc:"string Filter out files not matching this string."
     )
-    (fun templates_folder canonical_data_folder output_folder generated_folder () -> Controller.run templates_folder canonical_data_folder output_folder generated_folder)
+    (fun templates_folder canonical_data_folder output_folder generated_folder filter () -> Controller.run templates_folder canonical_data_folder output_folder generated_folder filter)
 
 let () =
   Command.run ~version:"0.1" command

data/tracks/ocaml/tools/test-generator/templates/atbash-cipher/template.ml

@@ -4,10 +4,18 @@ open Atbash_cipher
 
 let ae exp got _test_ctxt = assert_equal ~printer:String.to_string exp got
 
-let (* SUITE *)$(suite_name)_tests = [
+let (* SUITE encode *)encode_tests = [
 (* TEST
    "$description" >::
-     ae $expected ($suite-name $phrase);
+     ae $expected (encode $phrase);
+   END TEST *)
+]
+(* END SUITE *)
+
+let (* SUITE decode *)decode_tests = [
+(* TEST
+   "$description" >::
+     ae $expected (decode $phrase);
    END TEST *)
 ]
 (* END SUITE *)
@@ -20,5 +28,5 @@ let different_block_size_test = [
 let () =
   run_test_tt_main (
     "atbash-cipher tests" >:::
-      List.concat [(* suite-all-names *); different_block_size_test]
+      List.concat [encode_tests; decode_tests; different_block_size_test]
   )

data/tracks/ocaml/tools/test-generator/templates/beer-song/template.ml

@@ -23,10 +23,20 @@ let zip s1 s2 =
     then ()
     else failwith @@ "Expected differs from actual: " ^ (diff_message exp got)
 
-let (* SUITE *)$(suite_name)_tests = [
+let (* SUITE verse *)verse_tests = [
 (* TEST
    "$description" >::
-     ae $expected ($suite-name $number);
+     ae $expected 
+     (verse $number);
+   END TEST *)
+]
+(* END SUITE *)
+
+let (* SUITE lyrics *)lyrics_tests = [
+(* TEST
+   "$description" >::
+     ae $expected 
+     (lyrics ~from:$beginning ~until:$end);
    END TEST *)
 ]
 (* END SUITE *)
@@ -34,5 +44,5 @@ let (* SUITE *)$(suite_name)_tests = [
 let () =
   run_test_tt_main (
     "beer song tests" >:::
-      List.concat [(* suite-all-names *)]
+      List.concat [verse_tests; lyrics_tests]
   )

data/tracks/ocaml/tools/test-generator/templates/difference-of-squares/template.ml

@@ -4,10 +4,24 @@ open Difference_of_squares
 
 let ae exp got _test_ctxt = assert_equal exp got
 
-let (* SUITE *)$(suite_name)_tests = [
+let (* SUITE square_the_sum_of_the_numbers_up_to_the_given_number *)square_of_sum_tests = [
 (* TEST
    "$description" >::
-     ae $expected ($suite-name $number);
+     ae $expected (square_of_sum $number);
+   END TEST *)
+]
+(* END SUITE *)
+let (* SUITE sum_the_squares_of_the_numbers_up_to_the_given_number *)sum_of_squares_tests = [
+(* TEST
+   "$description" >::
+     ae $expected (sum_of_squares $number);
+   END TEST *)
+]
+(* END SUITE *)
+let (* SUITE subtract_sum_of_squares_from_square_of_sums *)difference_of_squares_tests = [
+(* TEST
+   "$description" >::
+     ae $expected (difference_of_squares $number);
    END TEST *)
 ]
 (* END SUITE *)
@@ -15,5 +29,5 @@ let (* SUITE *)$(suite_name)_tests = [
 let () =
   run_test_tt_main (
     "difference of squares tests" >:::
-      List.concat [(* suite-all-names *)]
+      List.concat [square_of_sum_tests; sum_of_squares_tests; difference_of_squares_tests]
   )

data/tracks/ocaml/tools/test-generator/templates/prime-factors/template.ml

@@ -0,0 +1,25 @@
+open Core.Std
+open OUnit2
+open Prime_factors
+
+(* Assert Equals *)
+let ae exp got _test_ctxt =
+  let printer = List.to_string ~f:Int64.to_string in
+  assert_equal exp got ~printer
+
+let to_int64s = List.map ~f:Int64.of_int
+
+(* 64 bits integers are needed for the last number.
+ *
+ * If you happen to use a 64 bits machine normal ints would do as well, but this
+ * works for everybody.
+ *)
+let tests = [
+(* TEST
+   "$description" >::
+      ae (to_int64s $expected) (factors_of $(input)L);
+   END TEST *)
+]
+
+let () =
+  run_test_tt_main ("prime-factors tests" >::: tests)

data/tracks/ocaml/tools/test-generator/templates/roman-numerals/template.ml

@@ -0,0 +1,15 @@
+open Core.Std
+open OUnit2
+open Roman_numerals
+
+let ae expected actual _ctx = assert_equal ~printer:Fn.id expected actual
+
+let tests = [
+(* TEST
+   "$description" >::
+      ae $expected (to_roman $number);
+   END TEST *)
+]
+
+let () =
+    run_test_tt_main ("roman-numerals test" >::: tests) 

data/tracks/ocaml/tools/test-generator/templates/run-length-encoding/template.ml

@@ -4,10 +4,26 @@ open Run_length_encoding
 
 let ae exp got _test_ctxt = assert_equal exp got ~printer:Fn.id
 
-let (* SUITE *)$(suite_name)_tests = [
+let (* SUITE run-length_encode_a_string *)encode_tests = [
 (* TEST
    "$description" >::
-     ae $expected ($suite-name $input);
+     ae $expected (encode $input);
+   END TEST *)
+]
+(* END SUITE *)
+
+let (* SUITE run-length_decode_a_string *)decode_tests = [
+(* TEST
+   "$description" >::
+     ae $expected (decode $input);
+   END TEST *)
+]
+(* END SUITE *)
+
+let (* SUITE encode_and_then_decode *)encode_and_then_decode_tests = [
+(* TEST
+   "$description" >::
+     ae $expected (encode $input |> decode);
    END TEST *)
 ]
 (* END SUITE *)
@@ -15,5 +31,5 @@ let (* SUITE *)$(suite_name)_tests = [
 let () =
   run_test_tt_main (
     "run length encoding tests" >:::
-      List.concat [(* suite-all-names *)]
+      List.concat [encode_tests; decode_tests; encode_and_then_decode_tests]
   )

data/tracks/ocaml/tools/test-generator/templates/space-age/template.ml

@@ -0,0 +1,19 @@
+open Core.Std
+open OUnit2
+open Space_age
+
+(* Assert In Delta *)
+let ae ~delta:delta exp got _ctxt =
+  let msg = sprintf "Expected %f got %f, difference is greater than %f"
+                    exp got delta in
+  assert_bool msg (cmp_float ~epsilon:delta exp got)
+
+let tests = [
+(* TEST
+   "$description" >::
+      ae ~delta:0.005 $expected (age_on $planet $seconds);
+   END TEST *)
+]
+
+let () =
+  run_test_tt_main ("space-age tests" >::: tests)

data/tracks/ocaml/tools/test-generator/templates/triangle/template.ml

@@ -0,0 +1,33 @@
+open Core.Std
+open OUnit2
+open Triangle
+
+let ae exp got _test_ctxt = assert_equal exp got ~printer:Bool.to_string
+
+let (* SUITE returns_true_if_the_triangle_is_equilateral *)equilateral_tests = [
+(* TEST
+   "$description" >::
+     ae $expected (is_equilateral $sides);
+   END TEST *)
+]
+(* END SUITE *)
+let (* SUITE returns_true_if_the_triangle_is_isosceles *)isoceles_tests = [
+(* TEST
+   "$description" >::
+     ae $expected (is_isoceles $sides);
+   END TEST *)
+]
+(* END SUITE *)
+let (* SUITE returns_true_if_the_triangle_is_scalene *)scalene_tests = [
+(* TEST
+   "$description" >::
+     ae $expected (is_scalene $sides);
+   END TEST *)
+]
+(* END SUITE *)
+
+let () =
+  run_test_tt_main (
+    "triangle tests" >:::
+      List.concat [equilateral_tests; isoceles_tests; scalene_tests]
+  )

data/tracks/ocaml/tools/test-generator/test/template_test.ml

@@ -13,14 +13,15 @@ let template_tests = [
 
   "if there is a test marker in a string then find_template returns where it is" >:: (fun _ctx ->
       let template_text = In_channel.read_all "test/sample_template.txt" in
-      assert_equal ~printer (Some {start=7; finish=9;
-                                   file_text=template_text; template="code";
-                                   suite_name_line= None;
-                                   suite_end = None;
-                                   suite_all_names_line = None}) @@ find_template ~template_text
+      let expected_single = Single {
+        start = 7;
+        finish = 9;
+        template = "code";
+      } in
+      assert_equal ~printer (Some {file_text = template_text; template = expected_single}) @@ find_template ~template_text
     );
 
-  "if there is a suite description line then find_template returns where it is" >:: (fun _ctx ->
+  (*"if there is a suite description line then find_template returns where it is" >:: (fun _ctx ->
       let template_text = In_channel.read_all "test/sample-suite-template.txt" in
       let template = find_template ~template_text in
       match template with
@@ -56,5 +57,5 @@ let template_tests = [
       assert_equal ~printer:Bool.to_string true (String.substr_index filled ~pattern:"line1" |> Option.is_some);
       assert_equal ~printer:Bool.to_string true (String.substr_index filled ~pattern:"line2" |> Option.is_some);
       assert_equal ~printer:Int.to_string 7 (String.count ~f:(fun ch -> ch = '\n') filled);
-    );
+    );*)
 ]

data/tracks/powershell/exercises/hamming/hamming.tests.ps1

@@ -9,7 +9,7 @@ Describe "HammingTest" {
 	It "tests log identical strands" {
 		Compute "GGACTGA" "GGACTGA" | Should be 0
 	}
-	
+
 	It "tests complete distance in single nucleotide strands" {
 		Compute "A" "G" | Should be 1
 	}
@@ -37,7 +37,7 @@ Describe "HammingTest" {
 	It "tests non unique character in second strand" {
 		Compute "AGG" "AGA" | Should be 1
 	}
-	
+
 	It "tests same nucleotides in different position" {
 		Compute "TAG" "GAT" | Should be 2
 	}
@@ -45,7 +45,7 @@ Describe "HammingTest" {
 	It "tests large distance" {
 		Compute "GATACA" "GCATAA" | Should be 4
 	}
-	
+
 	It "tests large distance in off by one strand" {
 		Compute "GGACGGATTCTG" "AGGACGGATTCT" | Should be 9
 	}
@@ -59,6 +59,6 @@ Describe "HammingTest" {
 	}
 
 	It "tests disallow second strand longer" {
-		{ Compute("ATA", "AGTG") } | Should Throw "Mismatching string lengths"
+		{ Compute "ATA" "AGTG" } | Should Throw "Mismatching string lengths"
 	}
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trackler
 version: !ruby/object:Gem::Version
-  version: 2.0.8.22
+  version: 2.0.8.23
 platform: ruby
 authors:
 - Katrina Owen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-16 00:00:00.000000000 Z
+date: 2017-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -1598,6 +1598,7 @@ files:
 - tracks/csharp/exercises/minesweeper/Minesweeper.csproj
 - tracks/csharp/exercises/minesweeper/MinesweeperTest.cs
 - tracks/csharp/exercises/nth-prime/Example.cs
+- tracks/csharp/exercises/nth-prime/HINTS.md
 - tracks/csharp/exercises/nth-prime/NthPrime.cs
 - tracks/csharp/exercises/nth-prime/NthPrime.csproj
 - tracks/csharp/exercises/nth-prime/NthPrimeTest.cs
@@ -1654,6 +1655,7 @@ files:
 - tracks/csharp/exercises/protein-translation/ProteinTranslation.csproj
 - tracks/csharp/exercises/protein-translation/ProteinTranslationTest.cs
 - tracks/csharp/exercises/proverb/Example.cs
+- tracks/csharp/exercises/proverb/HINTS.md
 - tracks/csharp/exercises/proverb/Proverb.cs
 - tracks/csharp/exercises/proverb/Proverb.csproj
 - tracks/csharp/exercises/proverb/ProverbTest.cs
@@ -4132,6 +4134,7 @@ files:
 - tracks/idris/exercises/leap/src/example.idr
 - tracks/idris/img/.keep
 - tracks/idris/img/icon.png
+- tracks/java/.Rhistory
 - tracks/java/.git
 - tracks/java/.gitignore
 - tracks/java/.keep
@@ -4206,6 +4209,12 @@ files:
 - tracks/java/exercises/bob/src/example/java/Bob.java
 - tracks/java/exercises/bob/src/main/java/.keep
 - tracks/java/exercises/bob/src/test/java/BobTest.java
+- tracks/java/exercises/book-store/build.gradle
+- tracks/java/exercises/book-store/src/example/java/.keep
+- tracks/java/exercises/book-store/src/example/java/Bookstore.java
+- tracks/java/exercises/book-store/src/main/java/.keep
+- tracks/java/exercises/book-store/src/test/java/.keep
+- tracks/java/exercises/book-store/src/test/java/BookstoreTest.java
 - tracks/java/exercises/bracket-push/build.gradle
 - tracks/java/exercises/bracket-push/src/example/java/BracketChecker.java
 - tracks/java/exercises/bracket-push/src/main/java/BracketChecker.java
@@ -4267,6 +4276,10 @@ files:
 - tracks/java/exercises/hexadecimal/src/example/java/Hexadecimal.java
 - tracks/java/exercises/hexadecimal/src/main/java/.keep
 - tracks/java/exercises/hexadecimal/src/test/java/HexadecimalTest.java
+- tracks/java/exercises/isogram/build.gradle
+- tracks/java/exercises/isogram/src/example/java/IsogramChecker.java
+- tracks/java/exercises/isogram/src/main/java/.keep
+- tracks/java/exercises/isogram/src/test/java/IsogramTest.java
 - tracks/java/exercises/largest-series-product/build.gradle
 - tracks/java/exercises/largest-series-product/src/example/java/LargestSeriesProductCalculator.java
 - tracks/java/exercises/largest-series-product/src/main/java/LargestSeriesProductCalculator.java
@@ -4354,9 +4367,9 @@ files:
 - tracks/java/exercises/queen-attack/src/main/java/QueenAttackCalculator.java
 - tracks/java/exercises/queen-attack/src/test/java/QueenAttackCalculatorTest.java
 - tracks/java/exercises/raindrops/build.gradle
-- tracks/java/exercises/raindrops/src/example/java/Raindrops.java
+- tracks/java/exercises/raindrops/src/example/java/RaindropConverter.java
 - tracks/java/exercises/raindrops/src/main/java/.keep
-- tracks/java/exercises/raindrops/src/test/java/RaindropsTest.java
+- tracks/java/exercises/raindrops/src/test/java/RaindropConverterTest.java
 - tracks/java/exercises/rectangles/build.gradle
 - tracks/java/exercises/rectangles/src/example/java/RectangleCounter.java
 - tracks/java/exercises/rectangles/src/main/java/RectangleCounter.java
@@ -5650,6 +5663,7 @@ files:
 - tracks/ocaml/.gitignore
 - tracks/ocaml/.travis-ci.sh
 - tracks/ocaml/.travis.yml
+- tracks/ocaml/.vscode/launch.json
 - tracks/ocaml/LICENSE
 - tracks/ocaml/Makefile
 - tracks/ocaml/README.md
@@ -5833,6 +5847,11 @@ files:
 - tracks/ocaml/exercises/space-age/example.ml
 - tracks/ocaml/exercises/space-age/space_age.mli
 - tracks/ocaml/exercises/space-age/test.ml
+- tracks/ocaml/exercises/triangle/.merlin
+- tracks/ocaml/exercises/triangle/Makefile
+- tracks/ocaml/exercises/triangle/example.ml
+- tracks/ocaml/exercises/triangle/test.ml
+- tracks/ocaml/exercises/triangle/triangle.mli
 - tracks/ocaml/exercises/word-count/.merlin
 - tracks/ocaml/exercises/word-count/Makefile
 - tracks/ocaml/exercises/word-count/example.ml
@@ -5854,6 +5873,7 @@ files:
 - tracks/ocaml/tools/test-generator/src/canonical_data_checker.ml
 - tracks/ocaml/tools/test-generator/src/codegen.ml
 - tracks/ocaml/tools/test-generator/src/controller.ml
+- tracks/ocaml/tools/test-generator/src/debug.ml
 - tracks/ocaml/tools/test-generator/src/files.ml
 - tracks/ocaml/tools/test-generator/src/model.ml
 - tracks/ocaml/tools/test-generator/src/parser.ml
@@ -5877,9 +5897,13 @@ files:
 - tracks/ocaml/tools/test-generator/templates/minesweeper/template.ml
 - tracks/ocaml/tools/test-generator/templates/pangram/template.ml
 - tracks/ocaml/tools/test-generator/templates/phone-number/template.ml
+- tracks/ocaml/tools/test-generator/templates/prime-factors/template.ml
 - tracks/ocaml/tools/test-generator/templates/raindrops/template.ml
+- tracks/ocaml/tools/test-generator/templates/roman-numerals/template.ml
 - tracks/ocaml/tools/test-generator/templates/run-length-encoding/template.ml
 - tracks/ocaml/tools/test-generator/templates/say/template.ml
+- tracks/ocaml/tools/test-generator/templates/space-age/template.ml
+- tracks/ocaml/tools/test-generator/templates/triangle/template.ml
 - tracks/ocaml/tools/test-generator/templates/word-count/template.ml
 - tracks/ocaml/tools/test-generator/test/all_tests.ml
 - tracks/ocaml/tools/test-generator/test/beer-song.json