X-Git-Url: https://git.xandkar.net/?a=blobdiff_plain;f=001%2Fsrc%2Flife_time.erl;h=25524212b5ce206ae56be83aa045d8dac1051e3a;hb=1d121bcf9312f8c869537e5d28f2c2964fe35169;hp=851aa0510ef3d6a618918e729fb27b8883571190;hpb=eec4cd1f37ccb353d325f7f8e46e6f9efaa02077;p=cellular-automata.git

diff --git a/001/src/life_time.erl b/001/src/life_time.erl
index 851aa05..2552421 100644
--- a/001/src/life_time.erl
+++ b/001/src/life_time.erl
@@ -3,8 +3,8 @@
 
 
 %% API
--export([start_link/2
-        ,tock/2
+-export([start_link/3
+        ,report_state/3
         ]).
 
 %% Callbacks
@@ -17,7 +17,7 @@
         ]).
 
 
--define(INTERVAL, 0).  % In milliseconds
+-define(INTERVAL, 100).  % In milliseconds
 
 -define(CHAR_DEAD,   32).  % Space
 -define(CHAR_ALIVE, 111).  % o
@@ -25,11 +25,12 @@
 
 
 -record(state, {x               :: integer()
+               ,y               :: integer()
                ,cells           :: list(atom())
                ,num_cells       :: integer()
                ,state_pairs     :: list(tuple(integer(), integer())) | []
                ,replies_pending :: integer()
-               ,gen_count = 0   :: integer()
+               ,gen_id          :: integer()
                }).
 
 
@@ -37,29 +38,31 @@
 %% API
 %% ============================================================================
 
-start_link(X, Cells) ->
+start_link(X, Y, Cells) ->
     ServerName = {local, ?MODULE},
-    Args = [X, Cells],
+    Args = [X, Y, Cells],
     Opts = [],
     gen_server:start_link(ServerName, ?MODULE, Args, Opts).
 
 
-tock(CellID, CellState) ->
-    gen_server:cast(?MODULE, {tock, {CellID, CellState}}).
+report_state(CellID, GenID, CellState) ->
+    gen_server:cast(?MODULE, {report_state, {CellID, GenID, CellState}}).
 
 
 %% ============================================================================
 %% Callbacks
 %% ============================================================================
 
-init([X, Cells]) ->
-    State = #state{x=X
-                  ,cells=Cells
-                  ,num_cells=length(Cells)
-                  ,state_pairs=[]
-                  ,replies_pending=0
+init([X, Y, Cells]) ->
+    State = #state{x               = X
+                  ,y               = Y
+                  ,cells           = Cells
+                  ,num_cells       = length(Cells)
+                  ,state_pairs     = []
+                  ,replies_pending = 0
+                  ,gen_id          = 0
                   },
-    schedule_next_tick(),
+    ok = schedule_next_gen(),
     {ok, State}.
 
 
@@ -75,44 +78,47 @@ handle_call(_Msg, _From, State) ->
     {reply, ok, State}.
 
 
-handle_cast(next_tick,
+handle_cast(next_gen,
     #state{cells=Cells
           ,num_cells=NumCells
           ,state_pairs=[]
+          ,gen_id=GenID
           }=State) ->
 
-    ok = cast_all(Cells, tick),
-    {noreply, State#state{replies_pending=NumCells}};
+    NewGenID = GenID + 1,
+    ok = cast_all(Cells, {next_gen, NewGenID}),
+    {noreply, State#state{replies_pending=NumCells, gen_id=NewGenID}};
 
-handle_cast({tock, {ID, CellState}},
+handle_cast({report_state, {CellID, GenID, CellState}},
     #state{x=X
+          ,y=Y
           ,state_pairs=StatePairs
           ,replies_pending=RepliesPending
-          ,gen_count=GenCount
+          ,gen_id=GenID
           ,num_cells=NumCells
           }=State) ->
 
-    NewStatePairs = [{ID, CellState} | StatePairs],
+    NewStatePairs = [{CellID, CellState} | StatePairs],
     NewRepliesPending = RepliesPending - 1,
     NewState = State#state{replies_pending=NewRepliesPending},
 
     case NewRepliesPending of
         0 ->
-            NewGenCount = GenCount + 1,
-            SortedStatePairs = lists:sort(NewStatePairs),
+            SortedStatePairs = lists:sort(
+                fun({A, _}, {B, _}) -> A < B end,
+                NewStatePairs
+            ),
             StateChars = [state_to_char(S) || {_, S} <- SortedStatePairs],
 
             ok = io:format(
-                "CELLS: ~b GENERATIONS: ~b~n",
-                [NumCells, NewGenCount]
+                "X: ~b Y: ~b CELLS: ~b GENERATION: ~b~n",
+                [X, Y, NumCells, GenID]
             ),
             ok = do_print_bar(X),
-
             ok = do_print_state_chars(X, StateChars),
-
             ok = timer:sleep(?INTERVAL),
-            schedule_next_tick(),
-            {noreply, NewState#state{state_pairs=[], gen_count=NewGenCount}};
+            ok = schedule_next_gen(),
+            {noreply, NewState#state{state_pairs=[]}};
 
         _N ->
             {noreply, NewState#state{state_pairs=NewStatePairs}}
@@ -130,8 +136,8 @@ handle_info(_Msg, State) ->
 %% Internal
 %% ============================================================================
 
-schedule_next_tick() ->
-    gen_server:cast(?MODULE, next_tick).
+schedule_next_gen() ->
+    ok = gen_server:cast(?MODULE, next_gen).
 
 
 cast_all([], _) -> ok;