home
/
code
/
cellular-automata.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Get rid of data labels.
[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
6d8cd00
..
e08dc2a
100644
(file)
--- 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
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 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
val print : 'a t -> to_string:('a -> string) -> unit
end
@@
-56,15
+56,15
@@
module Matrix : MATRIX = struct
type 'a t = 'a array array
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:(
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:(
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,26
+153,34
@@
module Conway : CELL = struct
end
end
-let rec loop bar pause_span grid =
- print_endline bar;
+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;
Matrix.print grid ~to_string:Conway.to_string;
- print_endline bar;
+ print_endline opt.bar;
+
let grid =
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
let neighbors = Matrix.get_neighbors grid point in
Conway.react cell ~states:(List.map neighbors ~f:Conway.state)
)
in
- Time.pause
pause_span
;
- loop
bar pause_span
grid
+ 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
let main () =
Random.self_init ();
let rs, ks = Or_error.ok_exn Linux_ext.get_terminal_size () in
- Matrix.create ~rs:(rs - 3) ~ks
~data:
()
+ Matrix.create ~rs:(rs - 3) ~ks ()
|> Matrix.map ~f:Conway.create
|> Matrix.map ~f:Conway.create
- |> loop (String.make ks '-') (Time.Span.of_float 0.1)
+ |> loop { interval = Time.Span.of_float 0.1
+ ; bar = String.make ks '-'
+ }
let spec =
let spec =
This page took
0.028532 seconds
and
4
git commands to generate.