From: Siraaj Khandkar <siraaj@khandkar.net>
Date: Wed, 25 Jul 2012 20:36:30 +0000 (-0400)
Subject: Added generation count to time and cell states.
X-Git-Url: https://git.xandkar.net/?a=commitdiff_plain;h=a88b29167618be4d288304b8d07ce62502217e74;p=cellular-automata.git

Added generation count to time and cell states.
---

diff --git a/001/src/life_cell.erl b/001/src/life_cell.erl
index 6f477cf..3f4669d 100644
--- a/001/src/life_cell.erl
+++ b/001/src/life_cell.erl
@@ -22,6 +22,7 @@
                ,live_neighbors  :: integer()
                ,num_neighbors   :: integer()
                ,replies_pending :: integer()
+               ,generation      :: integer()
                }).
 
 
@@ -64,13 +65,13 @@ handle_call(_Msg, _From, State) ->
     {reply, ok, State}.
 
 
-handle_cast(tick,
+handle_cast({tick, Generation},
     #state{name=Name
           ,neighbors=Neighbors
           ,num_neighbors=NumNeighbors
           }=State) ->
     ok = cast_all(Neighbors, {request_state, Name}),
-    {noreply, State#state{replies_pending=NumNeighbors}};
+    {noreply, State#state{replies_pending=NumNeighbors, generation=Generation}};
 
 
 handle_cast({request_state, Requester}, State) ->
diff --git a/001/src/life_time.erl b/001/src/life_time.erl
index 6f9d859..dfcec8a 100644
--- a/001/src/life_time.erl
+++ b/001/src/life_time.erl
@@ -30,7 +30,7 @@
                ,num_cells       :: integer()
                ,state_pairs     :: list(tuple(integer(), integer())) | []
                ,replies_pending :: integer()
-               ,gen_count = 0   :: integer()
+               ,generation = 0  :: integer()
                }).
 
 
@@ -81,17 +81,19 @@ handle_cast(next_tick,
     #state{cells=Cells
           ,num_cells=NumCells
           ,state_pairs=[]
+          ,generation=Generation
           }=State) ->
 
-    ok = cast_all(Cells, tick),
-    {noreply, State#state{replies_pending=NumCells}};
+    NewGeneration = Generation + 1,
+    ok = cast_all(Cells, {tick, NewGeneration}),
+    {noreply, State#state{replies_pending=NumCells, generation=NewGeneration}};
 
 handle_cast({tock, {ID, CellState}},
     #state{x=X
           ,y=Y
           ,state_pairs=StatePairs
           ,replies_pending=RepliesPending
-          ,gen_count=GenCount
+          ,generation=Generation
           ,num_cells=NumCells
           }=State) ->
 
@@ -101,7 +103,6 @@ handle_cast({tock, {ID, CellState}},
 
     case NewRepliesPending of
         0 ->
-            NewGenCount = GenCount + 1,
             SortedStatePairs = lists:sort(
                 fun({A, _}, {B, _}) -> A < B end,
                 NewStatePairs
@@ -109,8 +110,8 @@ handle_cast({tock, {ID, CellState}},
             StateChars = [state_to_char(S) || {_, S} <- SortedStatePairs],
 
             ok = io:format(
-                "X: ~b Y: ~b CELLS: ~b GENERATIONS: ~b~n",
-                [X, Y, NumCells, NewGenCount]
+                "X: ~b Y: ~b CELLS: ~b GENERATION: ~b~n",
+                [X, Y, NumCells, Generation]
             ),
             ok = do_print_bar(X),
 
@@ -118,7 +119,7 @@ handle_cast({tock, {ID, CellState}},
 
             ok = timer:sleep(?INTERVAL),
             schedule_next_tick(),
-            {noreply, NewState#state{state_pairs=[], gen_count=NewGenCount}};
+            {noreply, NewState#state{state_pairs=[]}};
 
         _N ->
             {noreply, NewState#state{state_pairs=NewStatePairs}}