home
/
code
/
cellular-automata.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use idiomatic abbreviations for rows and columns.
[cellular-automata.git]
/
polymorphic-life
/
001
/
src
/
polymorphic_life.ml
diff --git
a/polymorphic-life/001/src/polymorphic_life.ml
b/polymorphic-life/001/src/polymorphic_life.ml
index
e25bbf6
..
1afd1fe
100644
(file)
--- 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
module type MATRIX = sig
type 'a t
- val create : r
ows:int -> col
s:int -> data:'a -> 'a t
+ val create : r
s:int -> k
s:int -> data:'a -> 'a t
- val get : 'a t -> r
ow:int -> col
:int -> 'a
+ val get : 'a t -> r
:int -> k
:int -> 'a
- val
set : 'a t -> row:int -> col:int -> data:'a -> uni
t
+ val
map : 'a t -> f:('a -> 'b) -> 'b
t
- val map
: 'a t -> f:(row:int -> col
:int -> data:'a -> 'b) -> 'b t
+ val map
i : 'a t -> f:(r:int -> k
:int -> data:'a -> 'b) -> 'b t
- val iter : 'a t -> f:(r
ow: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
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
module Matrix : MATRIX = struct
type 'a t = 'a array array
- let create ~r
ows ~col
s ~data =
- Array.make_matrix ~dimx:r
ows ~dimy:col
s data
+ let create ~r
s ~k
s ~data =
+ Array.make_matrix ~dimx:r
s ~dimy:k
s data
let iter t ~f =
Array.iteri t ~f:(
let iter t ~f =
Array.iteri t ~f:(
- fun r
ow col
s ->
- Array.iteri
col
s ~f:(
- fun
col
data ->
- f ~r
ow ~col
~data
+ fun r
k
s ->
+ Array.iteri
k
s ~f:(
+ fun
k
data ->
+ f ~r
~k
~data
)
)
let print t ~to_string =
Array.iter t ~f:(
)
)
let print t ~to_string =
Array.iter t ~f:(
- fun r
ow
->
- Array.iter r
ow
~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 =
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:(
Array.mapi t ~f:(
- fun r
ow col
s ->
- Array.mapi
col
s ~f:(
- fun
col
data ->
- f ~r
ow ~col
~data
+ fun r
k
s ->
+ Array.mapi
k
s ~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
end
module type CELL = sig
type t
- val
init
: unit -> t
+ val
create
: unit -> t
val to_string : t -> string
val to_string : t -> string
@@
-85,7
+85,8
@@
module Conway : CELL = struct
| D -> " "
| A -> "o"
| D -> " "
| A -> "o"
- let init () = Random.int 2 |> of_int
+ let create () =
+ Random.int 2 |> of_int
let state = to_int
let state = to_int
@@
-96,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
| 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
end
-let main r
ows col
s () =
+let main r
s k
s () =
Random.self_init ();
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
Matrix.print grid ~to_string:Conway.to_string
This page took
0.03481 seconds
and
4
git commands to generate.