X-Git-Url: https://git.xandkar.net/?a=blobdiff_plain;f=polymorphic-life%2F001%2Fsrc%2Fpolymorphic_life.ml;h=1afd1fed708e4e00234eaf7e5b6520243bc12466;hb=63fe855dfac550cf84d839715edc4975a5d9a02b;hp=7b55572331618be1fe94fccf52a65dc4b25e604d;hpb=5c37daedbec6f75943578145d715a8e23d89cfd1;p=cellular-automata.git

diff --git a/polymorphic-life/001/src/polymorphic_life.ml b/polymorphic-life/001/src/polymorphic_life.ml
index 7b55572..1afd1fe 100644
--- a/polymorphic-life/001/src/polymorphic_life.ml
+++ b/polymorphic-life/001/src/polymorphic_life.ml
@@ -4,15 +4,15 @@ open Core.Std
 module type MATRIX = sig
   type 'a t
 
-  val create : rows:int -> cols:int -> data:'a -> 'a t
+  val create : rs:int -> ks:int -> data:'a -> 'a t
 
-  val get : 'a t -> row:int -> col:int -> 'a
+  val get : 'a t -> r:int -> k:int -> 'a
 
-  val set : 'a t -> row:int -> col:int -> data:'a -> unit
+  val map : 'a t -> f:('a -> 'b) -> 'b t
 
-  val map : 'a t -> f:(row:int -> col:int -> data:'a -> 'b) -> 'b t
+  val mapi : 'a t -> f:(r:int -> k:int -> data:'a -> 'b) -> 'b t
 
-  val iter : 'a t -> f:(row:int -> col:int -> data:'a -> unit) -> unit
+  val iter : 'a t -> f:(r:int -> k:int -> data:'a -> unit) -> unit
 
   val print : 'a t -> to_string:('a -> string) -> unit
 end
@@ -20,46 +20,46 @@ end
 module Matrix : MATRIX = struct
   type 'a t = 'a array array
 
-  let create ~rows ~cols ~data =
-    Array.make_matrix ~dimx:rows ~dimy:cols data
+  let create ~rs ~ks ~data =
+    Array.make_matrix ~dimx:rs ~dimy:ks data
 
   let iter t ~f =
     Array.iteri t ~f:(
-      fun row cols ->
-        Array.iteri cols ~f:(
-          fun col data ->
-            f ~row ~col ~data
+      fun r ks ->
+        Array.iteri ks ~f:(
+          fun k data ->
+            f ~r ~k ~data
         )
     )
 
   let print t ~to_string =
     Array.iter t ~f:(
-      fun row ->
-        Array.iter row ~f:(fun x -> printf "%s" (to_string x));
+      fun r ->
+        Array.iter r ~f:(fun x -> printf "%s" (to_string x));
         print_newline ()
     )
 
   let map t ~f =
+    Array.map t ~f:(Array.map ~f:(fun x -> f x))
+
+  let mapi t ~f =
     Array.mapi t ~f:(
-      fun row cols ->
-        Array.mapi cols ~f:(
-          fun col data ->
-            f ~row ~col ~data
+      fun r ks ->
+        Array.mapi ks ~f:(
+          fun k data ->
+            f ~r ~k ~data
         )
     )
 
-  let get t ~row ~col =
-    t.(row).(col)
-
-  let set t ~row ~col ~data =
-    t.(row).(col) <- data
+  let get t ~r ~k =
+    t.(r).(k)
 end
 
 
 module type CELL = sig
   type t
 
-  val init : unit -> t
+  val create : unit -> t
 
   val to_string : t -> string
 
@@ -85,7 +85,7 @@ module Conway : CELL = struct
     | D -> " "
     | A -> "o"
 
-  let init () =
+  let create () =
     Random.int 2 |> of_int
 
   let state = to_int
@@ -97,14 +97,14 @@ module Conway : CELL = struct
     | A when live_neighbors < 4 -> A
     | A when live_neighbors > 3 -> D
     | D when live_neighbors = 3 -> A
-    | t -> t
+    | A -> A
+    | D -> D
 end
 
 
-let main rows cols () =
+let main rs ks () =
   Random.self_init ();
-  let init ~row:_ ~col:_ ~data = Conway.init data in
-  let grid = Matrix.create ~rows ~cols ~data:() |> Matrix.map ~f:init in
+  let grid = Matrix.create ~rs ~ks ~data:() |> Matrix.map ~f:Conway.create in
   Matrix.print grid ~to_string:Conway.to_string