home
/
code
/
cellular-automata.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Explicitly matching casts with 'ok'.
[cellular-automata.git]
/
001
/
src
/
life_time.erl
diff --git
a/001/src/life_time.erl
b/001/src/life_time.erl
index
6827d29
..
2552421
100644
(file)
--- a/
001/src/life_time.erl
+++ b/
001/src/life_time.erl
@@
-3,8
+3,8
@@
%% API
%% API
--export([start_link/
2
- ,
tock/2
+-export([start_link/
3
+ ,
report_state/3
]).
%% Callbacks
]).
%% Callbacks
@@
-25,11
+25,12
@@
-record(state, {x :: integer()
-record(state, {x :: integer()
+ ,y :: integer()
,cells :: list(atom())
,num_cells :: integer()
,state_pairs :: list(tuple(integer(), integer())) | []
,replies_pending :: 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
%% ============================================================================
%% API
%% ============================================================================
-start_link(X, Cells) ->
+start_link(X,
Y,
Cells) ->
ServerName = {local, ?MODULE},
ServerName = {local, ?MODULE},
- Args = [X, Cells],
+ Args = [X,
Y,
Cells],
Opts = [],
gen_server:start_link(ServerName, ?MODULE, Args, Opts).
Opts = [],
gen_server:start_link(ServerName, ?MODULE, Args, Opts).
-
tock(Cell
ID, CellState) ->
- gen_server:cast(?MODULE, {
tock, {Cell
ID, CellState}}).
+
report_state(CellID, Gen
ID, CellState) ->
+ gen_server:cast(?MODULE, {
report_state, {CellID, Gen
ID, CellState}}).
%% ============================================================================
%% Callbacks
%% ============================================================================
%% ============================================================================
%% 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}.
{ok, State}.
@@
-75,30
+78,32
@@
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, {CellID, Gen
ID, CellState}},
#state{x=X
#state{x=X
+ ,y=Y
,state_pairs=StatePairs
,replies_pending=RepliesPending
,state_pairs=StatePairs
,replies_pending=RepliesPending
- ,gen_
count=GenCount
+ ,gen_
id=GenID
,num_cells=NumCells
}=State) ->
,num_cells=NumCells
}=State) ->
- NewStatePairs = [{ID, CellState} | StatePairs],
+ NewStatePairs = [{
Cell
ID, CellState} | StatePairs],
NewRepliesPending = RepliesPending - 1,
NewState = State#state{replies_pending=NewRepliesPending},
case NewRepliesPending of
0 ->
NewRepliesPending = RepliesPending - 1,
NewState = State#state{replies_pending=NewRepliesPending},
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
@@
-106,16
+111,14
@@
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(
- "
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_bar(X),
-
ok = do_print_state_chars(X, StateChars),
ok = do_print_state_chars(X, StateChars),
-
ok = timer:sleep(?INTERVAL),
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}}
_N ->
{noreply, NewState#state{state_pairs=NewStatePairs}}
@@
-133,8
+136,8
@@
handle_info(_Msg, State) ->
%% Internal
%% ============================================================================
%% Internal
%% ============================================================================
-schedule_next_
tick
() ->
-
gen_server:cast(?MODULE, next_tick
).
+schedule_next_
gen
() ->
+
ok = gen_server:cast(?MODULE, next_gen
).
cast_all([], _) -> ok;
cast_all([], _) -> ok;
This page took
0.046431 seconds
and
4
git commands to generate.