Reformatting for consistency.

[cellular-automata.git] / 003 / src / life.erl

diff --git a/003/src/life.erl b/003/src/life.erl
index ec755f1..5f91d26 100644 (file)
--- a/003/src/life.erl
+++ b/003/src/life.erl
@@ -10,13 +10,14 @@
 -define(INTERVAL, 100).
 
 
--record(state, {x                 :: non_neg_integer()
-               ,y                 :: non_neg_integer()
-               ,n                 :: non_neg_integer()
-               ,bar               :: string()
-               ,board=array:new() :: array()
-               ,gen_count         :: non_neg_integer()
-               ,gen_duration      :: non_neg_integer()
+-record(state, {x            :: non_neg_integer()
+               ,y            :: non_neg_integer()
+               ,n            :: pos_integer()
+               ,bar          :: nonempty_string()
+               ,board        :: array()
+               ,gen_count    :: pos_integer()
+               ,gen_duration :: non_neg_integer()
+               ,print_time   :: non_neg_integer()
                }).
 
 
@@ -32,8 +33,9 @@ bang(Args) ->
                   ,n            = X * Y
                   ,bar          = [?CHAR_BAR || _ <- lists:seq(1, X)]
                   ,board        = Board
-                  ,gen_count    = 1
+                  ,gen_count    = 1  % Consider inital state to be generation 1
                   ,gen_duration = Time
+                  ,print_time   = 0  % There was no print time yet
     },
     life_loop(State).
 
@@ -50,33 +52,49 @@ life_loop(
           ,board        = Board
           ,gen_count    = GenCount
           ,gen_duration = Time
+          ,print_time   = LastPrintTime
     }=State) ->
 
-    ok = do_print_status(Bar, X, Y, N, GenCount, Time),
-    ok = do_print_board(Board),
+    {PrintTime, ok} = timer:tc(
+        fun() ->
+            do_print_screen(Board, Bar, X, Y, N, GenCount, Time, LastPrintTime)
+        end
+    ),
+
+    {NewTime, NewBoard} = timer:tc(
+        fun() ->
+            next_generation(X, Y, Board)
+        end
+    ),
 
-    {NewTime, NewBoard} = timer:tc(fun() -> next_generation(X, Y, Board) end),
     NewState = State#state{board        = NewBoard
                           ,gen_count    = GenCount + 1
                           ,gen_duration = NewTime
+                          ,print_time   = PrintTime
     },
 
     timer:sleep(?INTERVAL),
     life_loop(NewState).
 
 
-do_print_status(Bar, X, Y, N, GenCount, TimeMic) ->
+do_print_screen(Board, Bar, X, Y, N, GenCount, Time, PrintTime) ->
+    ok = do_print_status(Bar, X, Y, N, GenCount, Time, PrintTime),
+    ok = do_print_board(Board).
+
+
+do_print_status(Bar, X, Y, N, GenCount, TimeMic, PrintTimeMic) ->
     TimeSec = TimeMic / 1000000,
+    PrintTimeSec = PrintTimeMic / 1000000,
     ok = io:format("~s~n", [Bar]),
     ok = io:format(
-        "X: ~b Y: ~b CELLS: ~b GENERATION: ~b DURATION: ~f~n",
-        [X, Y, N, GenCount, TimeSec]
+        "X: ~b Y: ~b CELLS: ~b GENERATION: ~b DURATION: ~f PRINT TIME: ~f~n",
+        [X, Y, N, GenCount, TimeSec, PrintTimeSec]
     ),
     ok = io:format("~s~n", [Bar]).
 
 
 do_print_board(Board) ->
-    CharLists = array:to_list(
+    RowStrings = array:to_list(
         array:map(
             fun(_, Row) ->
                 array:to_list(
@@ -93,10 +111,10 @@ do_print_board(Board) ->
     ),
 
     ok = lists:foreach(
-        fun(CharList) ->
-            ok = io:format("~s~n", [CharList])
+        fun(RowString) ->
+            ok = io:format("~s~n", [RowString])
         end,
-        CharLists
+        RowStrings
     ).