trackler 2.2.1.110 → 2.2.1.111

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

@@ -1,4 +1,4 @@
-open Core
+open Base
 
 let is_empty = String.for_all ~f:Char.is_whitespace
 
@@ -6,7 +6,7 @@ let is_shouting s =
   String.exists ~f:Char.is_alpha s &&
   String.for_all ~f:(fun c -> not (Char.is_alpha c) || Char.is_uppercase c) s
 
-let is_question s = s.[String.length s - 1] = '?'
+let is_question s = Char.(s.[String.length s - 1] = '?')
 
 let response_for s = 
   let s = String.strip s in 

data/tracks/ocaml/exercises/bob/jbuild

@@ -0,0 +1,11 @@
+(jbuild_version 1)
+
+(executable
+ ((name test)
+  (libraries (base oUnit))
+ ))
+
+(alias
+ ((name    runtest)
+  (deps    (test.exe))
+  (action  (run ${<}))))

data/tracks/ocaml/exercises/bowling/Makefile

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

data/tracks/ocaml/exercises/bowling/bowling.mli

@@ -1,4 +1,4 @@
-open Core
+open Base
 
 (** Abstract type for the bowling game. *)
 type t

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

@@ -1,4 +1,4 @@
-open! Core
+open Base
 
 type t = (int * int list)
 

data/tracks/ocaml/exercises/bowling/jbuild

@@ -0,0 +1,11 @@
+(jbuild_version 1)
+
+(executable
+ ((name test)
+  (libraries (base oUnit))
+ ))
+
+(alias
+ ((name    runtest)
+  (deps    (test.exe))
+  (action  (run ${<}))))

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

@@ -1,6 +1,6 @@
 (* Test/exercise version: "1.0.1" *)
 
-open! Core
+open Base
 open OUnit2
 open Bowling
 

data/tracks/ocaml/exercises/bracket-push/Makefile

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

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

@@ -1,4 +1,4 @@
-open Core
+open Base
 
 type 'a stack = 'a list
 
@@ -17,7 +17,7 @@ let update (s: (char stack) option) (ch: char): (char stack) option =
   match s with
   | None -> None
   | Some s ->
-    let pop_matching m = Option.filter (pop s) ~f:(fun (top, _) -> top = m)
+    let pop_matching m = Option.filter (pop s) ~f:(fun (top, _) -> Char.(top = m))
                          |> Option.map ~f:snd in
     match ch with
     | '(' | '{' | '[' -> Some (push s ch)

data/tracks/ocaml/exercises/bracket-push/jbuild

@@ -0,0 +1,11 @@
+(jbuild_version 1)
+
+(executable
+ ((name test)
+  (libraries (base oUnit))
+ ))
+
+(alias
+ ((name    runtest)
+  (deps    (test.exe))
+  (action  (run ${<}))))

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

@@ -1,6 +1,6 @@
 (* Test/exercise version: "1.2.0" *)
 
-open Core
+open Base
 open OUnit2
 open Bracket_push
 

data/tracks/ocaml/exercises/change/Makefile

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

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

@@ -1,4 +1,4 @@
-open Core
+open Base
 
 let find_smallest_coins_list_meeting_target (cache: int list option array) (coins: int list) (target: int): int list option =
   let find_coins_meeting_target_minus_coin coin = 

data/tracks/ocaml/exercises/change/jbuild

@@ -0,0 +1,11 @@
+(jbuild_version 1)
+
+(executable
+ ((name test)
+  (libraries (base oUnit))
+ ))
+
+(alias
+ ((name    runtest)
+  (deps    (test.exe))
+  (action  (run ${<}))))

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

@@ -1,10 +1,10 @@
 (* Test/exercise version: "1.1.0" *)
 
-open Core
+open Base
 open OUnit2
 open Change
 
-let printer = Option.value_map ~default:"None" ~f:(List.to_string ~f:Int.to_string)
+let printer = Option.value_map ~default:"None" ~f:(fun xs -> String.concat ~sep:";" (List.map ~f:Int.to_string xs))
 let ae exp got _test_ctxt = assert_equal ~printer exp got
 
 let tests = [

data/tracks/ocaml/exercises/connect/Makefile

@@ -1,15 +1,9 @@
-test: test.native
-	@./test.native
+default: clean test
 
-test.native: *.ml *.mli
-	@corebuild -r -quiet -pkg oUnit test.native
-
-main.byte: clean
-	@corebuild -r -quiet main.byte
+test: 
+	jbuilder runtest
 
 clean:
-	rm -rf _build
-	rm -f test.native
-	rm -f main.byte
+	jbuilder clean
 
 .PHONY: clean

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

@@ -1,21 +1,27 @@
-open Core
+open Base
 
 type player = O | X
 type cell = O | X | Empty
 
-module IntTuple = struct
-  type t = int * int
+let eq_cell c1 c2 = match (c1, c2) with
+| (O, O) -> true
+| (X, X) -> true
+| _ -> false
 
-  let compare (x0, y0) (x1, y1) =
-    match Int.compare x0 x1 with
-      0 -> Int.compare y0 y1
-    | c -> c
- 
-  let t_of_sexp tuple = Tuple2.t_of_sexp Int.t_of_sexp Int.t_of_sexp tuple
-  let sexp_of_t tuple = Tuple2.sexp_of_t Int.sexp_of_t Int.sexp_of_t tuple
+module IntTuple = struct
+  module T = struct
+    type t = int * int
+    let compare (x0, y0) (x1, y1) =
+      match Int.compare x0 x1 with
+        0 -> Int.compare y0 y1
+      | c -> c
+    let sexp_of_t (x, y) = Sexp.List [Sexp.Atom (Int.to_string x); Sexp.Atom (Int.to_string y)]
+  end
+  include T
+  include Comparable.Make(T)
 end
 
-module IntIntSet = Set.Make(IntTuple)
+let emptyIntIntSet = Set.empty (module IntTuple)
 
 let (>|>) f g = Fn.compose g f
 
@@ -42,7 +48,7 @@ let neighbouring_positions rows cols (r, c): (int * int) list =
 let neighbours board rows cols (r,c) =
   let cell = board.(r).(c) in
   let positions = neighbouring_positions rows cols (r,c) in
-  List.filter positions ~f:(fun (r1,c1) -> cell = board.(r1).(c1))
+  List.filter positions ~f:(fun (r1,c1) -> eq_cell cell board.(r1).(c1))
 
 let search successors initial ~matches = 
   let rec go visited node = 
@@ -61,20 +67,20 @@ let search successors initial ~matches =
       end
     else (false, visited)
   in
-  Array.exists initial ~f:(go (IntIntSet.empty) >|> fst)
+  Array.exists initial ~f:(go emptyIntIntSet >|> fst)
 
 let connect board: player option = 
   let board = to_matrix board in
   let rows = Array.length board in
   let cols = Array.length board.(0) in
   let search = search (neighbours board rows cols) in
-  let initials_x = Array.filter_mapi board ~f:(fun row cell -> if cell.(0) = X then Some (row, 0) else None) in
-  if search initials_x ~matches:(fun (r,c) -> (c = cols - 1) && board.(r).(c) = X)
+  let initials_x = Array.filter_mapi board ~f:(fun row cell -> if eq_cell cell.(0) X then Some (row, 0) else None) in
+  if search initials_x ~matches:(fun (r,c) -> (c = cols - 1) && eq_cell board.(r).(c) X)
   then Some X
   else 
   begin
-    let initials_o = Array.filter_mapi board.(0) ~f:(fun col cell -> if cell = O then Some (0, col) else None) in
-    if search initials_o ~matches:(fun (r,c) -> (r = rows - 1) && board.(r).(c) = O)
+    let initials_o = Array.filter_mapi board.(0) ~f:(fun col cell -> if eq_cell cell O then Some (0, col) else None) in
+    if search initials_o ~matches:(fun (r,c) -> (r = rows - 1) && eq_cell board.(r).(c) O)
       then Some O
       else None 
   end

data/tracks/ocaml/exercises/connect/jbuild

@@ -0,0 +1,11 @@
+(jbuild_version 1)
+
+(executable
+ ((name test)
+  (libraries (base oUnit))
+ ))
+
+(alias
+ ((name    runtest)
+  (deps    (test.exe))
+  (action  (run ${<}))))

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

@@ -1,6 +1,6 @@
 (* Test/exercise version: "1.1.0" *)
 
-open Core
+open Base
 open OUnit2
 open Connect
 

data/tracks/ocaml/exercises/custom-set/Makefile

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

data/tracks/ocaml/exercises/custom-set/jbuild

@@ -0,0 +1,11 @@
+(jbuild_version 1)
+
+(executable
+ ((name test)
+  (libraries (base oUnit))
+ ))
+
+(alias
+ ((name    runtest)
+  (deps    (test.exe))
+  (action  (run ${<}))))

data/tracks/ocaml/exercises/difference-of-squares/Makefile

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

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

@@ -1,4 +1,4 @@
-open Core
+open Base
 
 let rec range a b =
   if a > b then

data/tracks/ocaml/exercises/difference-of-squares/jbuild

@@ -0,0 +1,11 @@
+(jbuild_version 1)
+
+(executable
+ ((name test)
+  (libraries (base oUnit))
+ ))
+
+(alias
+ ((name    runtest)
+  (deps    (test.exe))
+  (action  (run ${<}))))

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

@@ -1,6 +1,5 @@
 (* Test/exercise version: "1.2.0" *)
 
-open Core
 open OUnit2
 open Difference_of_squares
 

data/tracks/ocaml/exercises/dominoes/Makefile

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

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

@@ -1,6 +1,6 @@
 (* Based off the Haskell solution by Tarmean at http://exercism.io/submissions/6dc2eef7e7eb469d8657111fc4389fc0 *)
 
-open Core
+open Base
 
 type dominoe = int * int
 

data/tracks/ocaml/exercises/dominoes/jbuild

@@ -0,0 +1,11 @@
+(jbuild_version 1)
+
+(executable
+ ((name test)
+  (libraries (base oUnit))
+ ))
+
+(alias
+ ((name    runtest)
+  (deps    (test.exe))
+  (action  (run ${<}))))

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

@@ -1,10 +1,10 @@
 (* Test/exercise version: "2.1.0" *)
 
-open Core
+open Base
 open OUnit2
 open Dominoes
 
-let print_dominoe (d1, d2) = sprintf "(%d,%d)" d1 d2
+let print_dominoe (d1, d2) = Printf.sprintf "(%d,%d)" d1 d2
 
 let dominoes_printer xs = "[" ^ String.concat ~sep:";" (List.map xs ~f:print_dominoe) ^ "]"
 let option_printer = function
@@ -13,14 +13,19 @@ let option_printer = function
 
 let rotate_1 xs = List.tl_exn xs @ [List.hd_exn xs]
 
+let tuple_compare (x0, y0) (x1, y1) =
+  if x0 < x1 then (-1)
+  else if x0 > x1 then 1
+  else Int.compare y0 y1
+
 let norm l =
   let norm1 (x, y) = if x > y then (y, x) else (x, y) in
-  List.map ~f:norm1 l |> List.sort ~cmp:compare
+  List.map ~f:norm1 l |> List.sort ~cmp:tuple_compare
 
 let check_chain (input: dominoe list) (chained: dominoe list) =
   assert_equal (norm input) (norm chained) ~printer:dominoes_printer ~msg:"chain doesn't use the same dominoes as the input";
   let assert_dominoes_match d1 d2 =
-    if snd d1 <> fst d2 then failwith @@ sprintf "%s and %s cannot be chained together" (print_dominoe d1) (print_dominoe d2) else () in
+    if snd d1 <> fst d2 then failwith @@ Printf.sprintf "%s and %s cannot be chained together" (print_dominoe d1) (print_dominoe d2) else () in
   let consecutives = List.zip_exn chained (rotate_1 chained) in
   List.iter consecutives ~f:(fun (d1, d2) -> assert_dominoes_match d1 d2)