Skip to content

fixes an issue where strategies could not be cleaned up #174

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 27, 2018
Merged

fixes an issue where strategies could not be cleaned up #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8016363
fixes an issue where strategies could not be cleaned up
Jun 27, 2018
e5289af
code cleanup
Jun 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/proper.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1366,7 +1366,7 @@ run({exists, TMap, Prop, Not}, #ctx{mode = new} = Ctx,
SR = perform_search(Steps, Target, Prop, Ctx, Opts, Not),
put('$size', BackupSize),
Print("]", []),
%% proper_target:cleanup_strategy(), TODO: why does this not work?
proper_target:cleanup_strategy(),
SR;
run({exists, TMap, Prop, Not}, #ctx{mode = try_shrunk, bound = []}, Opts) ->
run({exists, TMap, Prop, Not}, #ctx{mode = new, bound = []}, Opts#opts{output_fun = fun (_, _) -> ok end});
Expand Down
88 changes: 46 additions & 42 deletions src/proper_sa.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,49 +252,53 @@ retrieve_target(Key) ->
%% @private
-spec update_global_fitness(proper_target:fitness()) -> 'ok'.
update_global_fitness(Fitness) ->
Data = get(?SA_DATA),
K_CURRENT = (Data#sa_data.k_current),
K_MAX = (Data#sa_data.k_max),
Temperature = Data#sa_data.temperature,
NewData = case (Data#sa_data.last_energy =:= null)
orelse
(Data#sa_data.p)(Data#sa_data.last_energy,
case get(?SA_DATA) of
Data = #sa_data{k_current = K_CURRENT,
k_max = K_MAX,
temperature = Temperature,
temp_func = TempFunc} ->
NewData = case (Data#sa_data.last_energy =:= null)
orelse (Data#sa_data.p)(Data#sa_data.last_energy,
Fitness,
Temperature) of
true ->
%% accept new state
proper_gen_next:update_caches(accept),
NewState = update_all_targets(Data#sa_data.state),
%% calculate new temperature
{NewTemperature, AdjustedK} =
TempFunc(Temperature,
Data#sa_data.last_energy,
Fitness,
Temperature) of
true ->
%% accept new state
proper_gen_next:update_caches(accept),
NewState = update_all_targets(Data#sa_data.state),
%% calculate new temperature
{NewTemperature, AdjustedK} =
(Data#sa_data.temp_func)(Temperature,
Data#sa_data.last_energy,
Fitness,
K_MAX,
K_CURRENT,
true),
Data#sa_data{state = NewState,
last_energy = Fitness,
last_update = 0,
k_current = AdjustedK,
temperature = NewTemperature};
false ->
%% reject new state
%% calculate new temperature
proper_gen_next:update_caches(reject),
{NewTemperature, AdjustedK} =
(Data#sa_data.temp_func)(Temperature,
Data#sa_data.last_energy,
Fitness,
K_MAX,
K_CURRENT,
false),
Data#sa_data{last_update = Data#sa_data.last_update +1,
k_current = AdjustedK,
temperature = NewTemperature}
end,
put(?SA_DATA, NewData),
ok.
K_MAX,
K_CURRENT,
true),
Data#sa_data{state = NewState,
last_energy = Fitness,
last_update = 0,
k_current = AdjustedK,
temperature = NewTemperature};
false ->
%% reject new state
proper_gen_next:update_caches(reject),
%% calculate new temperature
{NewTemperature, AdjustedK} =
TempFunc(Temperature,
Data#sa_data.last_energy,
Fitness,
K_MAX,
K_CURRENT,
false),
Data#sa_data{last_update = Data#sa_data.last_update + 1,
k_current = AdjustedK,
temperature = NewTemperature}
end,
put(?SA_DATA, NewData),
ok;
_ ->
%% no search strategy or shrinking
ok
end.

%% update the last generated value with the current generated value
%% (hence accepting new state)
Expand Down
8 changes: 4 additions & 4 deletions src/proper_target.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ set_fitness(Fitness) ->

-spec strategy() -> strategy().
strategy() ->
get('$strategy').
get('$search_strategy').

strategy(Strat) ->
case Strat of
Expand All @@ -156,13 +156,13 @@ strategy(Strat) ->
-spec use_strategy(strategy(), proper:setup_opts()) -> proper:outer_test().
use_strategy(Strat, Opts) ->
Strategy = strategy(Strat),
put('$strategy', Strategy),
put('$search_strategy', Strategy),
Strategy:init_strategy(Opts).

-spec init_strategy(strategy()) -> ok.
init_strategy(Strat) ->
Strategy = strategy(Strat),
put('$strategy', Strategy),
put('$search_strategy', Strategy),
Steps = get('$search_steps'),
OutputFun = fun(_, _) -> ok end,
Strategy:init_strategy(#{numtests=>Steps, output_fun=>OutputFun}).
Expand All @@ -171,7 +171,7 @@ init_strategy(Strat) ->
-spec cleanup_strategy() -> ok.
cleanup_strategy() ->
(strategy()):cleanup(),
erase('$strategy'), ok.
ok.

%% @private
-spec get_target(key(), tmap()) -> target().
Expand Down