X-Git-Url: https://git.xandkar.net/?a=blobdiff_plain;f=001%2Fsrc%2Flife_time.erl;h=204b67f5b17ba7122ef32c3a1dbe77de159927e7;hb=3a20c476f299ddbe993ac28b5dec75a407edf338;hp=1140c79d5e531e633243e0adc6a373cd7b7601c3;hpb=7319e378a77a6be8fc887433c1bb2de08e108fcf;p=cellular-automata.git

diff --git a/001/src/life_time.erl b/001/src/life_time.erl
index 1140c79..204b67f 100644
--- a/001/src/life_time.erl
+++ b/001/src/life_time.erl
@@ -17,7 +17,7 @@
         ]).
 
 
--define(INTERVAL, 100).  % In milliseconds
+-define(GEN_INTERVAL, 100).  % In milliseconds
 
 -define(CHAR_DEAD,   32).  % " "
 -define(CHAR_ALIVE, 111).  % "o"
@@ -33,6 +33,7 @@
                ,state_pairs     :: list(tuple(integer(), integer())) | []
                ,replies_pending :: integer()
                ,gen_id          :: integer()
+               ,gen_began       :: erlang:timestamp()
                }).
 
 
@@ -73,7 +74,8 @@ init([X, Y, Cells]) ->
                   ,replies_pending = 0
                   ,gen_id          = 0
                   },
-    ok = schedule_next_gen(),
+    NextGenDelay = 0,
+    ok = schedule_next_gen(NextGenDelay),
     {ok, State}.
 
 
@@ -84,10 +86,12 @@ handle_info(next_gen,
           ,gen_id=GenID
           }=State) ->
 
+    GenBegan = os:timestamp(),
     NewGenID = GenID + 1,
     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
                           },
@@ -105,6 +109,7 @@ handle_cast({report_state, {CellID, GenID, CellState}},
           ,state_pairs=StatePairs
           ,replies_pending=RepliesPending
           ,gen_id=GenID
+          ,gen_began=GenBegan
           ,num_cells=NumCells
           }=State) ->
 
@@ -124,16 +129,21 @@ handle_cast({report_state, {CellID, GenID, CellState}},
             ),
             StateChars = [state_to_char(S) || {_, S} <- SortedStatePairs],
 
-            ok = life_observer:log_generation(GenID, NewNDead, NewNAlive),
+            GenDurationMic = timer:now_diff(os:timestamp(), GenBegan),
+            GenDurationMil = GenDurationMic / 1000,
+            GenDurationSec = GenDurationMic / 1000000,
+            NextGenDelay = round(?GEN_INTERVAL - GenDurationMil),
+
+            ok = life_observer:log_generation(GenID, GenDurationSec, 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, GenDurationSec]
             ),
             ok = do_print_bar(X),
             ok = do_print_state_chars(X, StateChars),
 
-            ok = schedule_next_gen(),
+            ok = schedule_next_gen(NextGenDelay),
             {noreply, NewState#state{state_pairs=[]}};
 
         _N ->
@@ -152,8 +162,12 @@ increment_dead_or_alive(0, NDead, NAlive) -> {NDead + 1, NAlive};
 increment_dead_or_alive(1, NDead, NAlive) -> {NDead, NAlive + 1}.
 
 
-schedule_next_gen() ->
-    erlang:send_after(?INTERVAL, self(), next_gen),
+schedule_next_gen(Delay) when Delay > 0 ->
+    erlang:send_after(Delay, self(), next_gen),
+    ok;
+
+schedule_next_gen(_) ->
+    erlang:send(self(), next_gen),
     ok.