home
/
code
/
cellular-automata.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Some terminology changes.
[cellular-automata.git]
/
001
/
src
/
life_time.erl
diff --git
a/001/src/life_time.erl
b/001/src/life_time.erl
index
6f9d859
..
b47073c
100644
(file)
--- a/
001/src/life_time.erl
+++ b/
001/src/life_time.erl
@@
-4,7
+4,7
@@
%% API
-export([start_link/3
%% API
-export([start_link/3
- ,
tock
/2
+ ,
report_state
/2
]).
%% Callbacks
]).
%% Callbacks
@@
-30,7
+30,7
@@
,num_cells :: integer()
,state_pairs :: list(tuple(integer(), integer())) | []
,replies_pending :: integer()
,num_cells :: integer()
,state_pairs :: list(tuple(integer(), integer())) | []
,replies_pending :: integer()
- ,gen_
count = 0
:: integer()
+ ,gen_
id
:: integer()
}).
}).
@@
-45,8
+45,8
@@
start_link(X, Y, Cells) ->
gen_server:start_link(ServerName, ?MODULE, Args, Opts).
gen_server:start_link(ServerName, ?MODULE, Args, Opts).
-
tock
(CellID, CellState) ->
- gen_server:cast(?MODULE, {
tock
, {CellID, CellState}}).
+
report_state
(CellID, CellState) ->
+ gen_server:cast(?MODULE, {
report_state
, {CellID, CellState}}).
%% ============================================================================
%% ============================================================================
@@
-54,14
+54,15
@@
tock(CellID, CellState) ->
%% ============================================================================
init([X, Y, Cells]) ->
%% ============================================================================
init([X, Y, Cells]) ->
- State = #state{x=X
- ,y=Y
- ,cells=Cells
- ,num_cells=length(Cells)
- ,state_pairs=[]
- ,replies_pending=0
+ State = #state{x = X
+ ,y = Y
+ ,cells = Cells
+ ,num_cells = length(Cells)
+ ,state_pairs = []
+ ,replies_pending = 0
+ ,gen_id = 0
},
},
- schedule_next_
tick
(),
+ schedule_next_
gen
(),
{ok, State}.
{ok, State}.
@@
-77,21
+78,23
@@
handle_call(_Msg, _From, State) ->
{reply, ok, State}.
{reply, ok, State}.
-handle_cast(next_
tick
,
+handle_cast(next_
gen
,
#state{cells=Cells
,num_cells=NumCells
,state_pairs=[]
#state{cells=Cells
,num_cells=NumCells
,state_pairs=[]
+ ,gen_id=GenID
}=State) ->
}=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
, {ID, CellState}},
#state{x=X
,y=Y
,state_pairs=StatePairs
,replies_pending=RepliesPending
#state{x=X
,y=Y
,state_pairs=StatePairs
,replies_pending=RepliesPending
- ,gen_
count=GenCount
+ ,gen_
id=GenID
,num_cells=NumCells
}=State) ->
,num_cells=NumCells
}=State) ->
@@
-101,7
+104,6
@@
handle_cast({tock, {ID, CellState}},
case NewRepliesPending of
0 ->
case NewRepliesPending of
0 ->
- NewGenCount = GenCount + 1,
SortedStatePairs = lists:sort(
fun({A, _}, {B, _}) -> A < B end,
NewStatePairs
SortedStatePairs = lists:sort(
fun({A, _}, {B, _}) -> A < B end,
NewStatePairs
@@
-109,16
+111,16
@@
handle_cast({tock, {ID, CellState}},
StateChars = [state_to_char(S) || {_, S} <- SortedStatePairs],
ok = io:format(
StateChars = [state_to_char(S) || {_, S} <- SortedStatePairs],
ok = io:format(
- "X: ~b Y: ~b CELLS: ~b GENERATION
S
: ~b~n",
- [X, Y, 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),
),
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
}};
+ schedule_next_
gen
(),
+ {noreply, NewState#state{state_pairs=[]}};
_N ->
{noreply, NewState#state{state_pairs=NewStatePairs}}
_N ->
{noreply, NewState#state{state_pairs=NewStatePairs}}
@@
-136,8
+138,8
@@
handle_info(_Msg, State) ->
%% Internal
%% ============================================================================
%% Internal
%% ============================================================================
-schedule_next_
tick
() ->
- gen_server:cast(?MODULE, next_
tick
).
+schedule_next_
gen
() ->
+ gen_server:cast(?MODULE, next_
gen
).
cast_all([], _) -> ok;
cast_all([], _) -> ok;
This page took
0.030587 seconds
and
4
git commands to generate.