X-Git-Url: https://git.xandkar.net/?a=blobdiff_plain;f=polymorphic-life%2F001%2Fsrc%2Fpolymorphic_life.ml;h=e08dc2acd8978d16bd06b0ddd15b2596c1379239;hb=a1665c9210867ffc55a4a609885d1d4cba840dbd;hp=a5e39c06c0335d9689fd021a566af9f13f860fbd;hpb=7c363dd8bc75151674c4f85f3cef61ded8b4655a;p=cellular-automata.git

diff --git a/polymorphic-life/001/src/polymorphic_life.ml b/polymorphic-life/001/src/polymorphic_life.ml
index a5e39c0..e08dc2a 100644
--- a/polymorphic-life/001/src/polymorphic_life.ml
+++ b/polymorphic-life/001/src/polymorphic_life.ml
@@ -8,15 +8,15 @@ module type MATRIX = sig
 
   type 'a t
 
-  val create : rs:int -> ks:int -> data:'a -> 'a t
+  val create : rs:int -> ks:int -> 'a -> 'a t
 
   val get_neighbors : 'a t -> Point.t -> 'a list
 
   val map : 'a t -> f:('a -> 'b) -> 'b t
 
-  val mapi : 'a t -> f:(Point.t -> data:'a -> 'b) -> 'b t
+  val mapi : 'a t -> f:(Point.t -> 'a -> 'b) -> 'b t
 
-  val iter : 'a t -> f:(Point.t -> data:'a -> unit) -> unit
+  val iter : 'a t -> f:(Point.t -> 'a -> unit) -> unit
 
   val print : 'a t -> to_string:('a -> string) -> unit
 end
@@ -56,15 +56,15 @@ module Matrix : MATRIX = struct
 
   type 'a t = 'a array array
 
-  let create ~rs ~ks ~data =
-    Array.make_matrix ~dimx:rs ~dimy:ks data
+  let create ~rs ~ks x =
+    Array.make_matrix ~dimx:rs ~dimy:ks x
 
   let iter t ~f =
     Array.iteri t ~f:(
       fun r ks ->
         Array.iteri ks ~f:(
-          fun k data ->
-            f {Point.r; Point.k} ~data
+          fun k x ->
+            f {Point.r; Point.k} x
         )
     )
 
@@ -82,8 +82,8 @@ module Matrix : MATRIX = struct
     Array.mapi t ~f:(
       fun r ks ->
         Array.mapi ks ~f:(
-          fun k data ->
-            f {Point.r; Point.k} ~data
+          fun k x ->
+            f {Point.r; Point.k} x
         )
     )
 
@@ -153,28 +153,39 @@ module Conway : CELL = struct
 end
 
 
-let main rs ks () =
-  Random.self_init ();
-  let grid = Matrix.create ~rs ~ks ~data:() |> Matrix.map ~f:Conway.create in
+type opt = { interval : Time.Span.t
+           ; bar      : string
+           }
+
+
+let rec loop opt grid =
+  print_endline opt.bar;
   Matrix.print grid ~to_string:Conway.to_string;
-  print_endline (String.make 80 '-');
+  print_endline opt.bar;
+
   let grid =
-    Matrix.mapi grid ~f:(fun point ~data:cell ->
+    Matrix.mapi grid ~f:(fun point cell ->
       let neighbors = Matrix.get_neighbors grid point in
       Conway.react cell ~states:(List.map neighbors ~f:Conway.state)
     )
   in
-  Matrix.print grid ~to_string:Conway.to_string
+  Time.pause opt.interval;
+  loop opt grid
+
+
+let main () =
+  Random.self_init ();
+  let rs, ks = Or_error.ok_exn Linux_ext.get_terminal_size () in
+  Matrix.create ~rs:(rs - 3) ~ks ()
+  |> Matrix.map ~f:Conway.create
+  |> loop { interval = Time.Span.of_float 0.1
+          ; bar      = String.make ks '-'
+          }
 
 
 let spec =
   let summary = "Polymorphic Cellular Automata" in
-  let spec =
-    let open Command.Spec in
-    empty
-    +> flag "-rows" (optional_with_default 5 int) ~doc:"Height"
-    +> flag "-cols" (optional_with_default 5 int) ~doc:"Width"
-  in
+  let spec = Command.Spec.empty in
   Command.basic ~summary spec main