Merge pull request #322 from matsen/322-batteries-2.1.0

Move to Batteries 2.1.0 / OCaml 4.01.0

opam-requirements.txt

@@ -2,7 +2,7 @@ csv.1.2.2
 ounit.1.1.2
 xmlm.1.1.1
 mcl.12-068oasis3
-batteries.2.0.0
+batteries.2.1.0
 ocaml-gsl.0.6.3
 sqlite3-ocaml.1.6.3
 camlzip.1.05

pplacer_src/minimization.ml

@@ -64,7 +64,7 @@ let robust_start_finder ?(max_iters=100) f raw_start left right _ =
         (* map those integers to their input values, and filter to make sure in
          * left right*)
         let jump_enum = Enum.filter
-          (fun x -> left < x & x < right)
+          (fun x -> left < x && x < right)
           (Enum.map (fun i -> raw_start +. (incr_ratio i)) jump_indices)
         in
         Enum.iter check_start jump_enum

pplacer_src/pca.ml

@@ -1,6 +1,6 @@
 open Ppatteries
 
-let tol = 1e-15
+let tol = 1e-14
 let max_iter = 100000
 
 

tests/guppy/test_unifrac.ml

@@ -13,6 +13,8 @@ let suite = [
     let names, (prl, prel) =
       pres_of_dir Mass_map.Spread Placement.ml_ratio "simple"
         |> Hashtbl.enum
+        (* Sort by name: Hashtbl does not guarantee order *)
+        |> (List.of_enum %> (List.sort compare) %> List.enum)
         |> Enum.uncombine
         |> (Tuple2.map Array.of_enum (List.of_enum %> List.split))
     in