X-Git-Url: https://git.xandkar.net/?a=blobdiff_plain;f=001%2Fsrc%2Flife_time.erl;h=22d3300d4d63dd5d5f645b2640860091770d0d9b;hb=90456d0857c0e6ac3f9550cc18f27ad158fa8dd8;hp=49ab6466ad4b6e1feec317df416e89057fcb3d4d;hpb=29199e7e6e93e242c9d9fecc7db67bb3e170d6d6;p=cellular-automata.git

diff --git a/001/src/life_time.erl b/001/src/life_time.erl
index 49ab646..22d3300 100644
--- a/001/src/life_time.erl
+++ b/001/src/life_time.erl
@@ -28,6 +28,8 @@
                ,y               :: integer()
                ,cells           :: list(atom())
                ,num_cells       :: integer()
+               ,num_dead        :: integer()
+               ,num_alive       :: integer()
                ,state_pairs     :: list(tuple(integer(), integer())) | []
                ,replies_pending :: integer()
                ,gen_id          :: integer()
@@ -49,6 +51,16 @@ report_state(CellID, GenID, CellState) ->
     gen_server:cast(?MODULE, {report_state, {CellID, GenID, CellState}}).
 
 
+%% ============================================================================
+%% Callbacks (unused)
+%% ============================================================================
+
+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}.
+
+
 %% ============================================================================
 %% Callbacks
 %% ============================================================================
@@ -62,22 +74,10 @@ init([X, Y, Cells]) ->
                   ,replies_pending = 0
                   ,gen_id          = 0
                   },
-    schedule_next_gen(),
-    {ok, State}.
-
-
-terminate(_Reason, State) ->
-    {ok, State}.
-
-
-code_change(_Old, State, _Other) ->
+    ok = schedule_next_gen(),
     {ok, State}.
 
 
-handle_call(_Msg, _From, State) ->
-    {reply, ok, State}.
-
-
 handle_cast(next_gen,
     #state{cells=Cells
           ,num_cells=NumCells
@@ -87,11 +87,18 @@ handle_cast(next_gen,
 
     NewGenID = GenID + 1,
     ok = cast_all(Cells, {next_gen, NewGenID}),
-    {noreply, State#state{replies_pending=NumCells, gen_id=NewGenID}};
+    NewState = State#state{replies_pending=NumCells
+                          ,gen_id=NewGenID
+                          ,num_dead=0
+                          ,num_alive=0
+                          },
+    {noreply, NewState};
 
 handle_cast({report_state, {CellID, GenID, CellState}},
     #state{x=X
           ,y=Y
+          ,num_dead=NDead
+          ,num_alive=NAlive
           ,state_pairs=StatePairs
           ,replies_pending=RepliesPending
           ,gen_id=GenID
@@ -100,7 +107,11 @@ handle_cast({report_state, {CellID, GenID, CellState}},
 
     NewStatePairs = [{CellID, CellState} | StatePairs],
     NewRepliesPending = RepliesPending - 1,
-    NewState = State#state{replies_pending=NewRepliesPending},
+    {NewNDead, NewNAlive} = increment_dead_or_alive(CellState, NDead, NAlive),
+    NewState = State#state{replies_pending=NewRepliesPending
+                          ,num_dead=NewNDead
+                          ,num_alive=NewNAlive
+                          },
 
     case NewRepliesPending of
         0 ->
@@ -111,13 +122,13 @@ handle_cast({report_state, {CellID, GenID, CellState}},
             StateChars = [state_to_char(S) || {_, S} <- SortedStatePairs],
 
             ok = io:format(
-                "X: ~b Y: ~b CELLS: ~b GENERATION: ~b~n",
-                [X, Y, NumCells, GenID]
+                "X: ~b Y: ~b CELLS: ~b DEAD: ~b ALIVE: ~b GENERATION: ~b~n",
+                [X, Y, NumCells, NewNDead, NewNAlive, GenID]
             ),
             ok = do_print_bar(X),
             ok = do_print_state_chars(X, StateChars),
             ok = timer:sleep(?INTERVAL),
-            schedule_next_gen(),
+            ok = schedule_next_gen(),
             {noreply, NewState#state{state_pairs=[]}};
 
         _N ->
@@ -128,16 +139,16 @@ handle_cast(_Msg, State) ->
     {noreply, State}.
 
 
-handle_info(_Msg, State) ->
-    {noreply, State}.
-
-
 %% ============================================================================
 %% Internal
 %% ============================================================================
 
+increment_dead_or_alive(0, NDead, NAlive) -> {NDead + 1, NAlive};
+increment_dead_or_alive(1, NDead, NAlive) -> {NDead, NAlive + 1}.
+
+
 schedule_next_gen() ->
-    gen_server:cast(?MODULE, next_gen).
+    ok = gen_server:cast(?MODULE, next_gen).
 
 
 cast_all([], _) -> ok;