X-Git-Url: https://git.xandkar.net/?a=blobdiff_plain;ds=sidebyside;f=001%2Fsrc%2Flife_time.erl;h=143573df3514cf3f736be1bfa85c82a2248a102b;hb=bdfda001fb7cb77f29552bca0071ff3d389b5fd7;hp=22d3300d4d63dd5d5f645b2640860091770d0d9b;hpb=90456d0857c0e6ac3f9550cc18f27ad158fa8dd8;p=cellular-automata.git

diff --git a/001/src/life_time.erl b/001/src/life_time.erl
index 22d3300..143573d 100644
--- a/001/src/life_time.erl
+++ b/001/src/life_time.erl
@@ -19,9 +19,9 @@
 
 -define(INTERVAL, 100).  % In milliseconds
 
--define(CHAR_DEAD,   32).  % Space
--define(CHAR_ALIVE, 111).  % o
--define(CHAR_BAR,    45).  % -
+-define(CHAR_DEAD,   32).  % " "
+-define(CHAR_ALIVE, 111).  % "o"
+-define(CHAR_BAR,    45).  % "-"
 
 
 -record(state, {x               :: integer()
@@ -33,6 +33,7 @@
                ,state_pairs     :: list(tuple(integer(), integer())) | []
                ,replies_pending :: integer()
                ,gen_id          :: integer()
+               ,gen_began       :: erlang:timestamp()
                }).
 
 
@@ -56,7 +57,6 @@ report_state(CellID, GenID, CellState) ->
 %% ============================================================================
 
 handle_call(_Msg, _From, State)  -> {reply, ok, State}.
-handle_info(_Msg, State)         -> {noreply, State}.
 code_change(_Old, State, _Other) -> {ok, State}.
 terminate(_Reason, State)        -> {ok, State}.
 
@@ -78,22 +78,28 @@ init([X, Y, Cells]) ->
     {ok, State}.
 
 
-handle_cast(next_gen,
+handle_info(next_gen,
     #state{cells=Cells
           ,num_cells=NumCells
           ,state_pairs=[]
           ,gen_id=GenID
           }=State) ->
 
+    GenBegan = os:timestamp(),
     NewGenID = GenID + 1,
-    ok = cast_all(Cells, {next_gen, NewGenID}),
+    ok = life_lib:cast_one2all(Cells, {next_gen, NewGenID}),
     NewState = State#state{replies_pending=NumCells
                           ,gen_id=NewGenID
+                          ,gen_began=GenBegan
                           ,num_dead=0
                           ,num_alive=0
                           },
     {noreply, NewState};
 
+handle_info(_Msg, State) ->
+    {noreply, State}.
+
+
 handle_cast({report_state, {CellID, GenID, CellState}},
     #state{x=X
           ,y=Y
@@ -102,6 +108,7 @@ handle_cast({report_state, {CellID, GenID, CellState}},
           ,state_pairs=StatePairs
           ,replies_pending=RepliesPending
           ,gen_id=GenID
+          ,gen_began=GenBegan
           ,num_cells=NumCells
           }=State) ->
 
@@ -121,13 +128,17 @@ handle_cast({report_state, {CellID, GenID, CellState}},
             ),
             StateChars = [state_to_char(S) || {_, S} <- SortedStatePairs],
 
+            GenDuration = timer:now_diff(os:timestamp(), GenBegan) / 1000000,
+
+            ok = life_observer:log_generation(GenID, GenDuration, NewNDead, NewNAlive),
+
             ok = io:format(
-                "X: ~b Y: ~b CELLS: ~b DEAD: ~b ALIVE: ~b GENERATION: ~b~n",
-                [X, Y, NumCells, NewNDead, NewNAlive, GenID]
+                "X: ~b Y: ~b CELLS: ~b DEAD: ~b ALIVE: ~b GENERATION: ~b DURATION: ~f~n",
+                [X, Y, NumCells, NewNDead, NewNAlive, GenID, GenDuration]
             ),
             ok = do_print_bar(X),
             ok = do_print_state_chars(X, StateChars),
-            ok = timer:sleep(?INTERVAL),
+
             ok = schedule_next_gen(),
             {noreply, NewState#state{state_pairs=[]}};
 
@@ -148,13 +159,8 @@ increment_dead_or_alive(1, NDead, NAlive) -> {NDead, NAlive + 1}.
 
 
 schedule_next_gen() ->
-    ok = gen_server:cast(?MODULE, next_gen).
-
-
-cast_all([], _) -> ok;
-cast_all([Server | Servers], Msg) ->
-    ok = gen_server:cast(Server, Msg),
-    cast_all(Servers, Msg).
+    erlang:send_after(?INTERVAL, self(), next_gen),
+    ok.
 
 
 state_to_char(0) -> ?CHAR_DEAD;