Skip to content
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

micro-optimise rand_curveball #927

Merged
merged 1 commit into from
May 1, 2024
Merged

micro-optimise rand_curveball #927

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions lib/Biodiverse/Randomise/CurveBall.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,13 +117,13 @@ END_PROGRESS_TEXT
}
}

printf "[RANDOMISE] Randomise using curveball algorithm for %s labels from %s groups\n",
scalar @sorted_labels, scalar @sorted_groups;
say "[RANDOMISE] Randomise using curveball algorithm for $n_labels labels from $n_groups groups";

# No need to consider groups that cannot be swapped out.
# Could use a binary search but this is only done once per iteration.
if (keys %has_max_richness) {
@sorted_groups = grep {!exists $has_max_richness{$_}} @sorted_groups;
$n_groups = scalar @sorted_groups;
}

$progress_bar->reset;
Expand Down Expand Up @@ -154,12 +154,12 @@ END_PROGRESS_TEXT
) {
$attempts++;

my $group1 = $sorted_groups[int $rand->rand (scalar @sorted_groups)];
my $group2 = $sorted_groups[int $rand->rand (scalar @sorted_groups)];
my $group1 = $sorted_groups[int $rand->rand ($n_groups)];
my $group2 = $sorted_groups[int $rand->rand ($n_groups)];
while ($group1 eq $group2) {
# handle pathological case of only one group
last MAIN_ITER if scalar @sorted_groups == 1;
$group2 = $sorted_groups[int $rand->rand (scalar @sorted_groups)];
last MAIN_ITER if $n_groups == 1;
$group2 = $sorted_groups[int $rand->rand ($n_groups)];
}

my \%labels1 = $lb_hash{$group1};
Expand Down
Loading