greg/machi
1
0
Fork 0
Code Issues 11 Pull requests 1 Projects Releases Packages Wiki Activity Actions

Fix PULSE model to accomodate API change from previous commit.

Browse source 
Now 1+ trim & fill transitions are collapsed to a single 'w_t+' atom.
The atom name is a bit odd; think about regexps and it hopefully
makes sense.
This commit is contained in:
Scott Lystig Fritchie 2014-02-20 21:06:10 +09:00
parent 431827f65e
commit fd32bcb308
1 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
prototype/corfurl/test/corfurl_pulse.erl
View file

@ -449,18 +449,19 @@ check_trace(Trace0, _Cmds, _Seed) ->
%% following four (4) acceptable transition orderings. %% following four (4) acceptable transition orderings.
{_, _, [{transitions, FinalTtns}]} = lists:last( {_, _, [{transitions, FinalTtns}]} = lists:last(
eqc_temporal:all_future(TransitionsR)), eqc_temporal:all_future(TransitionsR)),
FinaTtns_filtered = filter_transition_trimfill_suffixes(FinalTtns),
InvalidTransitions = orddict:fold( InvalidTransitions = orddict:fold(
fun(_LPN, [w_0], Acc) -> fun(_LPN, [w_0], Acc) ->
Acc; Acc;
(_LPN, [w_0,w_1], Acc) -> (_LPN, [w_0,w_1], Acc) ->
Acc; Acc;
(_LPN, [w_0,w_ft], Acc) -> (_LPN, [w_0,'w_t+'], Acc) ->
Acc; Acc;
(_LPN, [w_0,w_1,w_tt], Acc) -> (_LPN, [w_0,w_1,'w_t+'], Acc) ->
Acc; Acc;
(LPN, BadTtns, Acc) -> (LPN, BadTtns, Acc) ->
[{LPN, BadTtns}|Acc] [{LPN, BadTtns}|Acc]
end, [], FinalTtns), end, [], FinaTtns_filtered),
?WHENFAIL(begin ?WHENFAIL(begin
?QC_FMT("*ModsReads: ~p\n", [eqc_temporal:unions([Mods,Reads])]), ?QC_FMT("*ModsReads: ~p\n", [eqc_temporal:unions([Mods,Reads])]),
@ -600,6 +601,23 @@ filter_relation_facts(FilterFun, R) ->
[{TS1, TS2, lists:filter(FilterFun, Facts)} || {TS1, TS2, Facts} <- R]. [{TS1, TS2, lists:filter(FilterFun, Facts)} || {TS1, TS2, Facts} <- R].
%% {TS1, TS2, Facts} <- Reads, Fact <- Facts, BadFilter(Fact)], %% {TS1, TS2, Facts} <- Reads, Fact <- Facts, BadFilter(Fact)],
filter_transition_trimfill_suffixes(Ttns) ->
[{X, filter_1_transition_list(L)} || {X, L} <- Ttns].
filter_1_transition_list([]) ->
[];
filter_1_transition_list(Old) ->
New = lists:reverse(lists:dropwhile(fun(w_tt) -> true;
(w_ft) -> true;
(_) -> false
end, lists:reverse(Old))),
Suffix = case lists:last(Old) of
w_ft -> ['w_t+'];
w_tt -> ['w_t+'];
_ -> []
end,
New ++ Suffix.
log_make_call(Tag) -> log_make_call(Tag) ->
log_make_call(self(), Tag). log_make_call(self(), Tag).