Skip to content

Vectorize to increase speed of Counter(). #199

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Vectorize to increase speed of Counter(). #199

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
19757f5
Vectorize rowSums() to increase speed of Counter().
jdblischak Jan 12, 2021
b7c1c72
Vectorize for loop to increase speed of Counter().
jdblischak Feb 9, 2021
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
10 changes: 3 additions & 7 deletions R/MainBar.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,7 @@ Counter <- function(data, num_sets, start_col, name_of_sets, nintersections, mba
Freqs <- Freqs[!(rowSums(Freqs[ ,1:num_sets]) == 0), ]
#Aggregation by degree
if(tolower(aggregate) == "degree"){
for(i in 1:nrow(Freqs)){
Freqs$degree[i] <- rowSums(Freqs[ i ,1:num_sets])
}
Freqs$degree <- rowSums(Freqs[, 1:num_sets])
order_cols <- c()
for(i in 1:length(order_mat)){
order_cols[i] <- match(order_mat[i], colnames(Freqs))
Expand All @@ -47,10 +45,8 @@ Counter <- function(data, num_sets, start_col, name_of_sets, nintersections, mba
#delete rows used to order data correctly. Not needed to set up bars.
delete_row <- (num_sets + 2)
Freqs <- Freqs[ , -delete_row]
for( i in 1:nrow(Freqs)){
Freqs$x[i] <- i
Freqs$color <- mbar_color
}
Freqs$x <- 1:nrow(Freqs)
Freqs$color <- mbar_color
if(is.na(nintersections)){
nintersections = nrow(Freqs)
}
Expand Down
6 changes: 2 additions & 4 deletions R/Specific.intersections.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,8 @@ specific_intersections <- function(data, first.col, last.col, intersections, ord
#delete rows used to order data correctly. Not needed to set up bars.
delete_row <- (num_sets + 2)
Freqs <- Freqs[ , -delete_row]
for( i in 1:nrow(Freqs)){
Freqs$x[i] <- i
Freqs$color <- mbar_color
}
Freqs$x <- 1:nrow(Freqs)
Freqs$color <- mbar_color
Freqs <- na.omit(Freqs)
return(Freqs)
}