X-Git-Url: https://git.xandkar.net/?a=blobdiff_plain;f=001%2Fsrc%2Flife_cell.erl;h=e7cebcd4cec65d1645a9b711b7bc3847bce24073;hb=1ffcb224689a811c288832f01dbd3bc3fee503e1;hp=3f4669d790a796022a0377dd3e44b818950a8ee3;hpb=a88b29167618be4d288304b8d07ce62502217e74;p=cellular-automata.git

diff --git a/001/src/life_cell.erl b/001/src/life_cell.erl
index 3f4669d..e7cebcd 100644
--- a/001/src/life_cell.erl
+++ b/001/src/life_cell.erl
@@ -15,14 +15,14 @@
         ]).
 
 
--record(state, {id              :: integer()
+-record(state, {cell_id         :: integer()
                ,name            :: string()
                ,cell_state      :: 0 | 1
                ,neighbors       :: list(atom())
                ,live_neighbors  :: integer()
                ,num_neighbors   :: integer()
                ,replies_pending :: integer()
-               ,generation      :: integer()
+               ,gen_id          :: integer()
                }).
 
 
@@ -30,7 +30,7 @@
 %% API
 %% ============================================================================
 
-start_link({_ID, Name, _NeighborNames}=Datum) ->
+start_link({_, Name, _}=Datum) ->
     ServerName = {local, Name},
     Args = [Datum],
     Opts = [],
@@ -41,14 +41,14 @@ start_link({_ID, Name, _NeighborNames}=Datum) ->
 %% Callbacks
 %% ============================================================================
 
-init([{ID, Name, NeighborNames}]) ->
-    State = #state{id=ID
-                  ,name=Name
-                  ,cell_state=crypto:rand_uniform(0, 2)
-                  ,neighbors=NeighborNames
-                  ,num_neighbors=length(NeighborNames)
-                  ,live_neighbors=0
-                  ,replies_pending=0
+init([{CellID, Name, NeighborNames}]) ->
+    State = #state{cell_id         = CellID
+                  ,name            = Name
+                  ,cell_state      = crypto:rand_uniform(0, 2)
+                  ,neighbors       = NeighborNames
+                  ,num_neighbors   = length(NeighborNames)
+                  ,live_neighbors  = 0
+                  ,replies_pending = 0
                   },
     {ok, State}.
 
@@ -65,22 +65,30 @@ handle_call(_Msg, _From, State) ->
     {reply, ok, State}.
 
 
-handle_cast({tick, Generation},
-    #state{name=Name
+handle_cast({next_gen, GenID},
+    #state{cell_state=CellState
           ,neighbors=Neighbors
           ,num_neighbors=NumNeighbors
           }=State) ->
-    ok = cast_all(Neighbors, {request_state, Name}),
-    {noreply, State#state{replies_pending=NumNeighbors, generation=Generation}};
 
+    ok = cast_all(Neighbors, {state_broadcast, GenID, CellState}),
+    {noreply, State#state{replies_pending=NumNeighbors, gen_id=GenID}};
 
-handle_cast({request_state, Requester}, State) ->
-    ok = gen_server:cast(Requester, {response_state, State#state.cell_state}),
+
+%% If we receive 'state_broadcast' before we receive 'next_gen', throw it back
+%% in the queue. (Took me a while to realize this, but sometimes it is
+%% possible. The more there're cells, the more likely this is to happen.)
+handle_cast({state_broadcast, ReceivedGenID, _NeighborState}=Msg,
+    #state{gen_id=GenID, name=Name}=State) when GenID =/= ReceivedGenID->
+    ok = gen_server:cast(Name, Msg),
     {noreply, State};
 
 
-handle_cast({response_state, NeighborState},
-    #state{id=ID
+%% Now that we can be sure that this request is for the current generation, we
+%% can handle it
+handle_cast({state_broadcast, GenID, NeighborState},
+    #state{cell_id=CellID
+          ,gen_id=GenID
           ,replies_pending=Pending
           ,cell_state=CellState
           ,live_neighbors=LiveNeighbors
@@ -96,7 +104,7 @@ handle_cast({response_state, NeighborState},
     case NewPending of
         0 ->
             NewCellState = new_state(CellState, NewLiveNeighbors),
-            ok = life_time:tock(ID, NewCellState),
+            ok = life_time:report_state(CellID, GenID, NewCellState),
 
             {noreply, NewState#state{live_neighbors=0
                                     ,cell_state=NewCellState