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

Tiny refactoring of random number gen

Browse source
This commit is contained in:
Scott Lystig Fritchie 2014-10-26 17:57:44 +09:00
parent d2f93e919e
commit 01e3325b81
1 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
prototype/poc-machi/src/machi_chain_manager.erl
View file

@ -155,12 +155,11 @@ calc_up_nodes(MyName, OldThreshold, NoPartitionThreshold,
calc_network_partitions(Nodes, Seed1, OldPartition, calc_network_partitions(Nodes, Seed1, OldPartition,
OldThreshold, NoPartitionThreshold) -> OldThreshold, NoPartitionThreshold) ->
{Cutoff2, Seed2} = random:uniform_s(100,Seed1), {Cutoff2, Seed2} = random:uniform_s(100, Seed1),
if Cutoff2 < OldThreshold -> if Cutoff2 < OldThreshold ->
{Seed2, OldPartition}; {Seed2, OldPartition};
true -> true ->
{F3, Seed3} = random:uniform_s(Seed1), {Cutoff3, Seed3} = random:uniform_s(100, Seed1),
Cutoff3 = trunc(F3 * 100),
if Cutoff3 < NoPartitionThreshold -> if Cutoff3 < NoPartitionThreshold ->
{Seed3, []}; {Seed3, []};
true -> true ->
@ -180,8 +179,6 @@ make_projection_summary(#projection{epoch_number=EpochNum,
repairing=Repairing_list}) -> repairing=Repairing_list}) ->
[{epoch,EpochNum}, [{epoch,EpochNum},
{upi,UPI_list},{repair,Repairing_list},{down,Down_list}]. {upi,UPI_list},{repair,Repairing_list},{down,Down_list}].
%% [{epoch,EpochNum},{all,All_list},{down,Down_list},
%% {upi,UPI_list},{repair,Repairing_list}].
roll_dice(N, RunEnv) -> roll_dice(N, RunEnv) ->
Seed1 = proplists:get_value(seed, RunEnv), Seed1 = proplists:get_value(seed, RunEnv),
@ -195,12 +192,10 @@ make_network_partition_locations(Nodes, Seed1) ->
Num = length(Pairs), Num = length(Pairs),
{Seed2, Weights} = lists:foldl( {Seed2, Weights} = lists:foldl(
fun(_, {Seeda, Acc}) -> fun(_, {Seeda, Acc}) ->
{F, Seedb} = random:uniform_s(Seeda), {Cutoff, Seedb} = random:uniform_s(100, Seeda),
Cutoff = trunc(F * 100),
{Seedb, [Cutoff|Acc]} {Seedb, [Cutoff|Acc]}
end, {Seed1, []}, lists:seq(1, Num)), end, {Seed1, []}, lists:seq(1, Num)),
{F3, Seed3} = random:uniform_s(Seed2), {Cutoff3, Seed3} = random:uniform_s(100, Seed2),
Cutoff3 = trunc(F3 * 100),
{Seed3, [X || {Weight, X} <- lists:zip(Weights, Pairs), {Seed3, [X || {Weight, X} <- lists:zip(Weights, Pairs),
Weight < Cutoff3]}. Weight < Cutoff3]}.